Ver Fonte

feat:活动中心展示储值卡 权益卡

xuyunhui há 1 ano atrás
pai
commit
cf293eddbd

+ 0 - 2
main.js

@@ -7,8 +7,6 @@ import env from './common/js/env'
 // 通用方法
 // import commonUtils from "./common/js/commonUtils.js"
 
-console.log(`process`, process.envenv)
-
 import uView from "uview-ui";
 const baseUrl = env.baseUrl;
 Vue.use(uView);

+ 51 - 0
myPages/myActivityDetail/myActivityDetail.vue

@@ -102,7 +102,58 @@
         <!--              </view>-->
 
       </view>
+      <view class="out2" v-if="activity.equityList">
+        <view class="flex-col ticket">
+          <view class="flex-row justify-center title">
+            <text>赠送权益卡</text>
+          </view>
+
+          <view class="flex-row ticketList" v-for="(i,index) in activity.equityList">
+            <view class="h-text flex-col justify-center ">
+              <text class="money">{{i.salePrice}}</text>
+              <text class="desc">售价</text>
+            </view>
+
+            <view class="h-center-content flex-col justify-around">
+              <view class="h-value">
+                <text>{{ i.title }}</text>
+              </view>
+              <view class="ticketMsg">
+                适用门店:{{ i.useStoreDesc || '' }}
+              </view>
+              <view class="ticketMsg">
+                领取后{{ i.effectiveDays }}天内有效
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="out2" v-if="activity.rechargeList">
+        <view class="flex-col ticket">
+          <view class="flex-row justify-center title">
+            <text>赠送储值卡</text>
+          </view>
 
+          <view class="flex-row ticketList" v-for="(i,index) in activity.rechargeList">
+            <view class="h-text flex-col justify-center ">
+              <text class="money">{{i.reachPrice}}</text>
+              <text class="desc">储值额度</text>
+            </view>
+
+            <view class="h-center-content flex-col justify-around">
+              <view class="h-value">
+                <text>{{ i.name }}</text>
+              </view>
+              <view class="ticketMsg">
+                开始时间:{{ i.startTime.split(" ")[0] || '' }}
+              </view>
+              <view class="ticketMsg">
+                结束时间:{{ i.endTime.split(" ")[0] || '' }}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
 
     </view>
 

+ 0 - 1
myPages/systemSwitch/index.vue

@@ -567,7 +567,6 @@ export default {
       if (idx == 0) { // 点击确认
         console.log(this.userInfo.phone)
 
-
         if (this.isSelect === true) {
           this.$refs.popup.close()
           // this.getOldMember();

+ 50 - 1
orderPages/activityDetail/activityDetail.vue

@@ -20,7 +20,6 @@
             </view>
           </view>
           <view class="flex-row">
-
             <view class="activityKey ">
               <text>活动门店:</text>
             </view>
@@ -106,8 +105,58 @@
 <!--              </view>-->
 
       </view>
+      <view class="out2" v-if="activity.equityList">
+        <view class="flex-col ticket">
+          <view class="flex-row justify-center title">
+            <text>赠送权益卡</text>
+          </view>
 
+          <view class="flex-row ticketList" v-for="(i,index) in activity.equityList">
+            <view class="h-text flex-col justify-center ">
+              <text class="money">{{i.salePrice}}</text>
+              <text class="desc">售价</text>
+            </view>
 
+            <view class="h-center-content flex-col justify-around">
+              <view class="h-value">
+                <text>{{ i.title }}</text>
+              </view>
+              <view class="ticketMsg">
+                适用门店:{{ i.useStoreDesc || '' }}
+              </view>
+              <view class="ticketMsg">
+                领取后{{ i.effectiveDays }}天内有效
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="out2" v-if="activity.rechargeList">
+        <view class="flex-col ticket">
+          <view class="flex-row justify-center title">
+            <text>赠送储值卡</text>
+          </view>
+
+          <view class="flex-row ticketList" v-for="(i,index) in activity.rechargeList">
+            <view class="h-text flex-col justify-center ">
+              <text class="money">{{i.reachPrice}}</text>
+              <text class="desc">储值额度</text>
+            </view>
+
+            <view class="h-center-content flex-col justify-around">
+              <view class="h-value">
+                <text>{{ i.name }}</text>
+              </view>
+              <view class="ticketMsg">
+                开始时间:{{ i.startTime.split(" ")[0] || '' }}
+              </view>
+              <view class="ticketMsg">
+                结束时间:{{ i.endTime.split(" ")[0] || '' }}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
     </view>
 
     <view class="flex-row justify-center inBtnView" >

+ 2 - 2
orderPages/activityDetail/index.rpx.scss

@@ -78,7 +78,7 @@
   text-align: center;
 }
 .h-center-content{
-  width: 298rpx;
+
   height: 188rpx;
 }
 
@@ -148,4 +148,4 @@
 }
 .activityValue{
   flex: 1;
-}
+}