订单结算修改，增加限时折扣

pages/user/coupon.vue

@@ -1,6 +1,9 @@
 <template>
 	<view class="container">
 		<view class="header-wrap">
+			<view class="u-flex" style="justify-content: flex-end;">
+				<view @click="toExchangeCode" class="color-333 font-12 u-m-b-26 font-700">优惠券兑换码</view>
+			</view>
 			<view class="search-wrap">
 				<view class="input-wrap">
 					<view class="icon left">
@@ -137,7 +140,11 @@ onReachBottom(() => {
 		getCouponList();
 	}
 });
-
+function toExchangeCode(){
+	uni.navigateTo({
+		url: '/user/exchange/index'
+	})
+}
 const showDetail = ref(false);
 const selectListItem = ref('');
 const selectListItemDetails = ref([]);

pages/user/member/billDetails.vue

@@ -63,7 +63,9 @@
 							<text v-if="item.bizCode == 'freeIn'">
 								霸王餐充值
 							</text>
-							
+							<text v-if="item.bizCode == 'rechargeRedemption'">
+								兑换券充值
+							</text>
 						</view>
 						<view v-else>
 							{{item.content}}

pages/user/member/czzx.vue

@@ -25,6 +25,7 @@
           <text class="n t">{{ shopUserInfo.amount || 0 }}</text>
         </view>
         <view class="right">
+          <text class="t" @click="toduihuan">兑换码</text>
           <text class="t" @click="toDetail">明细</text>
           <text class="t" @click="toPwd">密码设置</text>
         </view>
@@ -161,7 +162,7 @@ import * as rechargeApi from "@/common/api/market/recharge.js";
 import { recharge } from "@/common/api/order/index.js";
 import { joinMember } from "@/common/api/order/index.js";
 import { ref, onMounted, computed, reactive, watch } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad, onShow } from "@dcloudio/uni-app";
 import { pay } from "@/utils/pay.js";
 
 function toShopList() {
@@ -170,6 +171,12 @@ function toShopList() {
   });
 }
 
+function toduihuan() {
+  uni.navigateTo({
+    url: "/user/exchange/index",
+  });
+}
+
 function couponNum(list) {
   return list.reduce((prve, cur) => {
     return prve + cur.num;
@@ -285,7 +292,7 @@ const charge_money = computed(() => {
 });
 onLoad((opt) => {
   Object.assign(option, opt);
-  init();
+  // init();
 });
 
 watch(
@@ -296,6 +303,9 @@ watch(
     }
   }
 );
+onShow(() => {
+  init();
+});
 </script>
 
 <style scoped lang="scss">
@@ -367,7 +377,7 @@ watch(
     display: flex;
     justify-content: space-between;
     position: relative;
-    padding-top: 40upx;
+    padding-top: 20rpx;
 
     .left {
       display: flex;

pages/user/user.vue

@@ -224,7 +224,7 @@
       <!-- <l-qrcode  :value="wechatAcQrcode"  @complete="e=>qrcodeResult(e)"/> -->
       <view
         class="qrcode u-flex u-col-center justify-between"
-        v-if="qrcode"
+        v-if="showQrcode"
       >
         <view>
           <view class="color-000 font-14 font-bold">扫码关注公众号</view>
@@ -259,10 +259,8 @@ import * as rechargeApi from "@/common/api/market/recharge.js";
 import { pointsShopList } from "@/common/api/account/points.js";
 
 
-const qrcode = ref("");
 
 function qrcodeResult(res) {
-  console.log("qrcodeResult", res);
   qrcode.value = res
 }
 
@@ -470,7 +468,14 @@ onShow(() => {
   getData();
 });
 
+const qrcode = ref("");
+const showQrcode = computed(() => {
 
+  const followIndex = uni.cache.get("followIndex");
+  if ( followIndex == "mine" && qrcode.value) {
+    return true;
+  }
+});
 </script>
 
 <style scoped lang="scss">