韩昌 / 3z-healthMall-v3-uni · 提交

转到一个项目

作者 韩昌
提交 5bac9d6d47082d29f132eea3f25f96bca71761cf 1 个父辈 c97f1a95

修改11.32修改bug

内嵌 并排对比
正在显示 11 个修改的文件 包含 275 行增加 和 191 行删除
@@ -5,12 +5,17 @@ @@ -5,12 +5,17 @@
5 <image :src="it.image" mode=""></image> 5 <image :src="it.image" mode=""></image>
6 </view> 6 </view>
7 <view class="info"> 7 <view class="info">
8 - <view class="shopTitle ellipsis">{{ it.goods_name }}</view>  
9 - <view class="desc ellipsis">{{ it.describe }}</view>  
10 - <view class="num ellipsis">x{{ it.total_num }}</view> 8 + <view class="topBox">
  9 + <view class="shopTitle ellipsis">{{ it.goods_name }}</view>
  10 + <view class="desc ellipsis">{{ it.describe }}</view>
  11 + <view class="num ellipsis" v-if="![2].includes(shop.order_status)">x{{ it.total_num }}</view>
  12 + </view>
11 <!-- 非积分商品 --> 13 <!-- 非积分商品 -->
12 <view class="priceBox flexJ" v-if="it.goodstatus != 3"> 14 <view class="priceBox flexJ" v-if="it.goodstatus != 3">
13 - <text>￥{{ it.total_price }}</text> 15 + <view class="flexA">
  16 + <text>￥{{ it.total_price }}</text>
  17 + <text v-if="shop.goodstatus_text === 2" class="linePrice">122</text>
  18 + </view>
14 <view class="reality flexA"> 19 <view class="reality flexA">
15 <view class="shi">{{ textHandler(shop.order_status) }}</view> 20 <view class="shi">{{ textHandler(shop.order_status) }}</view>
16 <text>￥</text> 21 <text>￥</text>
@@ -19,10 +24,23 @@ @@ -19,10 +24,23 @@
19 </view> 24 </view>
20 <!-- 积分商品 --> 25 <!-- 积分商品 -->
21 <view class="pointsShop" v-else> 26 <view class="pointsShop" v-else>
22 - <text>{{ textHandler(shop.order_status) }}</text>  
23 - <image src="/static/shopCarIc/pointsIc.png" mode=""></image>  
24 - <view class="points">{{ it.coscore }}</view>  
25 - <view class="pointsPrice">￥{{ it.diff_price }}</view> 27 + <!-- 待发货 -->
  28 + <template v-if="[2].includes(shop.order_status)">
  29 + <div class="flexJ" style="flex: 1">
  30 + <view class="flexA">
  31 + <image src="/static/shopCarIc/pointsIc.png" mode=""></image>
  32 + <view class="pointsPrice">{{ shop.score }}</view>
  33 + </view>
  34 +
  35 + <view class="num ellipsis">x{{ it.total_num }}</view>
  36 + </div>
  37 + </template>
  38 + <template v-else>
  39 + <text>{{ textHandler(shop.order_status) }}</text>
  40 + <image src="/static/shopCarIc/pointsIc.png" mode=""></image>
  41 + <view class="points">{{ it.coscore }}</view>
  42 + <view class="pointsPrice">￥{{ it.diff_price }}</view>
  43 + </template>
26 </view> 44 </view>
27 </view> 45 </view>
28 </view> 46 </view>
@@ -67,6 +85,9 @@ onMounted(() => { @@ -67,6 +85,9 @@ onMounted(() => {
67 85
68 .info { 86 .info {
69 width: 100%; 87 width: 100%;
  88 + display: flex;
  89 + flex-direction: column;
  90 + justify-content: space-between;
70 91
71 .shopTitle { 92 .shopTitle {
72 color: #323233ff; 93 color: #323233ff;
@@ -149,4 +170,8 @@ onMounted(() => { @@ -149,4 +170,8 @@ onMounted(() => {
149 } 170 }
150 } 171 }
151 } 172 }
  173 +.linePrice {
  174 + text-decoration: line-through;
  175 + color: rgba($color: #000000, $alpha: 0.3) !important;
  176 +}
152 </style> 177 </style>
@@ -39,14 +39,14 @@ @@ -39,14 +39,14 @@
39 <view @click.stop="operateOrder(item, 2)" v-if="item.order_status == 2" class="orange flexC">申请退款</view> 39 <view @click.stop="operateOrder(item, 2)" v-if="item.order_status == 2" class="orange flexC">申请退款</view>
40 <!-- 待收货 --> 40 <!-- 待收货 -->
41 <view class="flexA" v-if="item.order_status == 3"> 41 <view class="flexA" v-if="item.order_status == 3">
42 - <view v-if="item.order_status == 3 && item.goodstatus_text == ''" class="cancel flexC"> 42 + <view v-if="item.order_status == 3 && item.goodstatus_text == ''" class="cancel flexC" @click.stop="true">
43 <button open-type="contact"></button> 43 <button open-type="contact"></button>
44 联系客服 44 联系客服
45 </view> 45 </view>
46 <view @click.stop="operateOrder(item, 3)" class="orange flexC">确认收货</view> 46 <view @click.stop="operateOrder(item, 3)" class="orange flexC">确认收货</view>
47 </view> 47 </view>
48 <!-- 待评价 --> 48 <!-- 待评价 -->
49 - <view @click.stop="operateOrder(item, 4)" v-if="item.order_status == 4" class="orange flexC">评价</view> 49 + <view @click.stop="operateOrder(item, 4)" v-if="item.order_status == 5" class="orange flexC">评价</view>
50 <!-- 售后 --> 50 <!-- 售后 -->
51 <view @click.stop="operateOrder(item, 5)" v-if="item.order_status == 21" class="orange flexC">查看详情</view> 51 <view @click.stop="operateOrder(item, 5)" v-if="item.order_status == 21" class="orange flexC">查看详情</view>
52 </view> 52 </view>
@@ -132,7 +132,7 @@ const copy = text => { @@ -132,7 +132,7 @@ const copy = text => {
132 // tabs切换 132 // tabs切换
133 const click = e => { 133 const click = e => {
134 console.log(e) 134 console.log(e)
135 - getOrderLists(e.index == 5 ? 21 : e.index) 135 + getOrderLists(e.index == 5 ? 21 : e.index == 4 ? 5 : e.index)
136 } 136 }
137 //订单状态: 0=全部,1=待付款,2=待发货,3=待收货,4=待评价,11=已取消,21=售后 137 //订单状态: 0=全部,1=待付款,2=待发货,3=待收货,4=待评价,11=已取消,21=售后
138 const getOrderLists = async status => { 138 const getOrderLists = async status => {
1 <template> 1 <template>
2 - <!-- 我的积分 我的余额-->  
3 - <view class="">  
4 - <u-navbar placeholder :title=" type==0 ? '我的余额' : '我的积分' " bgColor="#F6F8FA" :autoBack="true"></u-navbar>  
5 - <view class="mainBox">  
6 - <view class="redBg flexV">  
7 - <view class="title">{{type==0 ? '余额' :'积分'}}</view>  
8 - <view class="price flexV" v-if="type==0">  
9 - <text>{{integral}}</text>  
10 - <view class="btn flexC" @click="toRecharge">立即充值</view>  
11 - </view>  
12 - <view class="num flexA" v-else>  
13 - <image src="/static/shopCarIc/pointsIc.png" mode=""></image>  
14 - {{integral}}  
15 - </view>  
16 - </view>  
17 - <view class="detailBox">  
18 - <view class="detailTitle">{{type==0 ? '余额明细' : '积分明细'}}</view>  
19 - <view class="time flexJ" v-for="item in recordList" :key="item.id">  
20 - <text>{{item.createtime}}</text>  
21 - <text>{{item.before*1 - item.after*1 >0 ? '-' : '+'}}{{ type==0? item.money : item.score}}</text>  
22 - </view>  
23 - </view>  
24 - </view>  
25 - </view> 2 + <!-- 我的积分 我的余额-->
  3 + <view class="">
  4 + <u-navbar placeholder :title="type == 0 ? '我的余额' : '我的积分'" bgColor="#F6F8FA" :autoBack="true"></u-navbar>
  5 + <view class="mainBox">
  6 + <view class="redBg flexV">
  7 + <view class="title">{{ type == 0 ? '余额' : '积分' }}</view>
  8 + <view class="price flexV" v-if="type == 0">
  9 + <text>{{ integral }}</text>
  10 + <view class="btn flexC" @click="toRecharge">立即充值</view>
  11 + </view>
  12 + <view class="num flexA" v-else>
  13 + <image src="/static/shopCarIc/pointsIc.png" mode=""></image>
  14 + {{ integral }}
  15 + </view>
  16 + </view>
  17 + <view class="detailBox">
  18 + <view class="detailTitle">{{ type == 0 ? '余额明细' : '积分明细' }}</view>
  19 + <view class="time flexJ" v-for="item in recordList" :key="item.id">
  20 + <text>{{ item.createtime }}</text>
  21 + <text>{{ item.before * 1 - item.after * 1 > 0 ? '-' : '+' }}{{ type == 0 ? item.money : item.score }}</text>
  22 + </view>
  23 + </view>
  24 + </view>
  25 + </view>
26 </template> 26 </template>
27 27
28 <script setup> 28 <script setup>
29 - import { ref } from 'vue'  
30 - import { onShow,onLoad } from '@dcloudio/uni-app'  
31 - import { getyue,getMoneyDetail,getMyScore,getScoreDetail } from '@/api/'  
32 - onLoad((e)=> {  
33 - //console.log(11111,e.type) //0余额 1积分  
34 - type.value = e.type //0余额 1积分  
35 - if(e.type == 0) {  
36 - getyues() // 我的余额  
37 - getMoneyDetails() //余额明细  
38 - } else {  
39 - getMyScores() //我的积分  
40 - getScoreDetails() //我的积分明细  
41 - }  
42 - })  
43 - const toRecharge = ()=> {  
44 - uni.navigateTo({  
45 - url:'/pages/mine/recharge'  
46 - })  
47 - }  
48 - let integral = ref(0) //积分 //余额  
49 - let recordList = ref([]) //明细  
50 - let type = ref(0) //0 余额 1积分  
51 - // 我的余额  
52 - const getyues = async ()=> {  
53 - try {  
54 - const res = await getyue()  
55 - integral.value = res.money  
56 - uni.setStorageSync('balance',res.money)  
57 - console.log('getyue', res)  
58 - // 保存数据  
59 - } catch (err) {  
60 - uni.showToast({ title:err,icon:'none' })  
61 - console.log('getyue', err)  
62 - }  
63 - }  
64 - // 余额明细  
65 - const getMoneyDetails = async ()=> {  
66 - try {  
67 - const res = await getMoneyDetail()  
68 - recordList.value = res.mingxi  
69 - console.log('getMoneyDetail', res)  
70 - // 保存数据  
71 - } catch (err) {  
72 - uni.showToast({ title:err,icon:'none' })  
73 - console.log('getMoneyDetail', err)  
74 - }  
75 - }  
76 - // 我的积分  
77 - const getMyScores = async ()=> {  
78 - try {  
79 - const res = await getMyScore()  
80 - integral.value = res.score  
81 - uni.setStorageSync('myPoints',res.score)  
82 - console.log('getMyScore', res)  
83 - // 保存数据  
84 - } catch (err) {  
85 - uni.showToast({ title:err,icon:'none' })  
86 - console.log('getMyScore', err)  
87 - }  
88 - }  
89 - // 积分明细  
90 - const getScoreDetails = async ()=> {  
91 - try {  
92 - const res = await getScoreDetail()  
93 - recordList.value = res.mingxi  
94 - console.log('getScoreDetail', res)  
95 - // 保存数据  
96 - } catch (err) {  
97 - uni.showToast({ title:err,icon:'none' })  
98 - console.log('getScoreDetail', err)  
99 - }  
100 - } 29 +import { ref } from 'vue'
  30 +import { onShow, onLoad } from '@dcloudio/uni-app'
  31 +import { getyue, getMoneyDetail, getMyScore, getScoreDetail } from '@/api/'
  32 +onLoad(e => {
  33 + //console.log(11111,e.type) //0余额 1积分
  34 + type.value = e.type //0余额 1积分
  35 + if (e.type == 0) {
  36 + getyues() // 我的余额
  37 + getMoneyDetails() //余额明细
  38 + } else {
  39 + getMyScores() //我的积分
  40 + getScoreDetails() //我的积分明细
  41 + }
  42 +})
  43 +const toRecharge = () => {
  44 + uni.navigateTo({
  45 + url: '/pages/mine/recharge'
  46 + })
  47 +}
  48 +let integral = ref(0) //积分 //余额
  49 +let recordList = ref([]) //明细
  50 +let type = ref(0) //0 余额 1积分
  51 +// 我的余额
  52 +const getyues = async () => {
  53 + try {
  54 + const res = await getyue()
  55 + integral.value = res.money
  56 + uni.setStorageSync('balance', res.money)
  57 + console.log('getyue', res)
  58 + // 保存数据
  59 + } catch (err) {
  60 + uni.showToast({ title: err, icon: 'none' })
  61 + console.log('getyue', err)
  62 + }
  63 +}
  64 +// 余额明细
  65 +const getMoneyDetails = async () => {
  66 + try {
  67 + const res = await getMoneyDetail()
  68 + recordList.value = res.mingxi
  69 + console.log('getMoneyDetail', res)
  70 + // 保存数据
  71 + } catch (err) {
  72 + uni.showToast({ title: err, icon: 'none' })
  73 + console.log('getMoneyDetail', err)
  74 + }
  75 +}
  76 +// 我的积分
  77 +const getMyScores = async () => {
  78 + try {
  79 + const res = await getMyScore()
  80 + integral.value = res.score
  81 + uni.setStorageSync('myPoints', res.score)
  82 + console.log('getMyScore', res)
  83 + // 保存数据
  84 + } catch (err) {
  85 + uni.showToast({ title: err, icon: 'none' })
  86 + console.log('getMyScore', err)
  87 + }
  88 +}
  89 +// 积分明细
  90 +const getScoreDetails = async () => {
  91 + try {
  92 + const res = await getScoreDetail()
  93 + recordList.value = res
  94 + console.log('getScoreDetail', res)
  95 + // 保存数据
  96 + } catch (err) {
  97 + uni.showToast({ title: err, icon: 'none' })
  98 + console.log('getScoreDetail', err)
  99 + }
  100 +}
101 </script> 101 </script>
102 102
103 <style lang="scss"> 103 <style lang="scss">
104 - .mainBox {  
105 - padding: 24rpx; 104 +.mainBox {
  105 + padding: 24rpx;
106 106
107 - .redBg {  
108 - padding: 36rpx 0 40rpx;  
109 - width: 702rpx;  
110 - border-radius: 16rpx;  
111 - opacity: 1;  
112 - background: #fb4c3cff; 107 + .redBg {
  108 + padding: 36rpx 0 40rpx;
  109 + width: 702rpx;
  110 + border-radius: 16rpx;
  111 + opacity: 1;
  112 + background: #fb4c3cff;
113 113
114 - .title {  
115 - color: #ffffffff;  
116 - font-size: 40rpx;  
117 - font-weight: 700;  
118 - } 114 + .title {
  115 + color: #ffffffff;
  116 + font-size: 40rpx;
  117 + font-weight: 700;
  118 + }
119 119
120 - .price {  
121 - margin-top: 16rpx; 120 + .price {
  121 + margin-top: 16rpx;
122 122
123 - text {  
124 - color: #ffffffff;  
125 - font-size: 64rpx;  
126 - margin-bottom: 24rpx;  
127 - } 123 + text {
  124 + color: #ffffffff;
  125 + font-size: 64rpx;
  126 + margin-bottom: 24rpx;
  127 + }
128 128
129 - .btn {  
130 - width: 256rpx;  
131 - height: 80rpx;  
132 - border-radius: 80rpx;  
133 - color: #000000ff;  
134 - font-size: 32rpx;  
135 - font-weight: 700;  
136 - background: #fff1f0ff;  
137 - }  
138 - } 129 + .btn {
  130 + width: 256rpx;
  131 + height: 80rpx;
  132 + border-radius: 80rpx;
  133 + color: #000000ff;
  134 + font-size: 32rpx;
  135 + font-weight: 700;
  136 + background: #fff1f0ff;
  137 + }
  138 + }
139 139
140 - .num {  
141 - margin-top: 28rpx;  
142 - color: #ffffffff;  
143 - font-size: 64rpx; 140 + .num {
  141 + margin-top: 28rpx;
  142 + color: #ffffffff;
  143 + font-size: 64rpx;
144 144
145 - image {  
146 - margin-right: 22rpx;  
147 - width: 64rpx;  
148 - height: 64rpx;  
149 - }  
150 - }  
151 - } 145 + image {
  146 + margin-right: 22rpx;
  147 + width: 64rpx;
  148 + height: 64rpx;
  149 + }
  150 + }
  151 + }
152 152
153 - .detailBox {  
154 - margin-top: 24rpx;  
155 - padding: 24rpx;  
156 - background: #fff;  
157 - border-radius: 16rpx; 153 + .detailBox {
  154 + margin-top: 24rpx;
  155 + padding: 24rpx;
  156 + background: #fff;
  157 + border-radius: 16rpx;
158 158
159 - .detailTitle {  
160 - color: #000000ff;  
161 - font-size: 32rpx;  
162 - font-weight: 700;  
163 - margin-bottom: 16rpx;  
164 - } 159 + .detailTitle {
  160 + color: #000000ff;
  161 + font-size: 32rpx;
  162 + font-weight: 700;
  163 + margin-bottom: 16rpx;
  164 + }
165 165
166 - .time {  
167 - margin-bottom: 24rpx;  
168 - color: #000000e6;  
169 - font-size: 28rpx;  
170 - }  
171 - }  
172 - } 166 + .time {
  167 + margin-bottom: 24rpx;
  168 + color: #000000e6;
  169 + font-size: 28rpx;
  170 + }
  171 + }
  172 +}
173 </style> 173 </style>
@@ -21,21 +21,31 @@ const _sfc_main = { @@ -21,21 +21,31 @@ const _sfc_main = {
21 return common_vendor.e({ 21 return common_vendor.e({
22 a: it.image, 22 a: it.image,
23 b: common_vendor.t(it.goods_name), 23 b: common_vendor.t(it.goods_name),
24 - c: common_vendor.t(it.describe),  
25 - d: common_vendor.t(it.total_num), 24 + c: common_vendor.t(it.describe)
  25 + }, ![2].includes(__props.shop.order_status) ? {
  26 + d: common_vendor.t(it.total_num)
  27 + } : {}, {
26 e: it.goodstatus != 3 28 e: it.goodstatus != 3
27 - }, it.goodstatus != 3 ? { 29 + }, it.goodstatus != 3 ? common_vendor.e({
28 f: common_vendor.t(it.total_price), 30 f: common_vendor.t(it.total_price),
29 - g: common_vendor.t(textHandler(__props.shop.order_status)),  
30 - h: common_vendor.t(it.total_price) 31 + g: __props.shop.goodstatus_text === 2
  32 + }, __props.shop.goodstatus_text === 2 ? {} : {}, {
  33 + h: common_vendor.t(textHandler(__props.shop.order_status)),
  34 + i: common_vendor.t(it.total_price)
  35 + }) : common_vendor.e({
  36 + j: [2].includes(__props.shop.order_status)
  37 + }, [2].includes(__props.shop.order_status) ? {
  38 + k: common_vendor.t(__props.shop.score),
  39 + l: common_vendor.t(it.total_num)
31 } : { 40 } : {
32 - i: common_vendor.t(textHandler(__props.shop.order_status)),  
33 - j: common_vendor.t(it.coscore),  
34 - k: common_vendor.t(it.diff_price)  
35 - }, {  
36 - l: it.id 41 + m: common_vendor.t(textHandler(__props.shop.order_status)),
  42 + n: common_vendor.t(it.coscore),
  43 + o: common_vendor.t(it.diff_price)
  44 + }), {
  45 + p: it.id
37 }); 46 });
38 - }) 47 + }),
  48 + b: ![2].includes(__props.shop.order_status)
39 }; 49 };
40 }; 50 };
41 } 51 }
1 -<view wx:for="{{a}}" wx:for-item="it" wx:key="l" class="shop"><view class="shopPhoto"><image src="{{it.a}}" mode=""></image></view><view class="info"><view class="shopTitle ellipsis">{{it.b}}</view><view class="desc ellipsis">{{it.c}}</view><view class="num ellipsis">x{{it.d}}</view><view wx:if="{{it.e}}" class="priceBox flexJ"><text>￥{{it.f}}</text><view class="reality flexA"><view class="shi">{{it.g}}</view><text>￥</text><view class="price">{{it.h}}</view></view></view><view wx:else class="pointsShop"><text>{{it.i}}</text><image src="/static/shopCarIc/pointsIc.png" mode=""></image><view class="points">{{it.j}}</view><view class="pointsPrice">￥{{it.k}}</view></view></view></view>  
  1 +<view wx:for="{{a}}" wx:for-item="it" wx:key="p" class="shop"><view class="shopPhoto"><image src="{{it.a}}" mode=""></image></view><view class="info"><view class="topBox"><view class="shopTitle ellipsis">{{it.b}}</view><view class="desc ellipsis">{{it.c}}</view><view wx:if="{{b}}" class="num ellipsis">x{{it.d}}</view></view><view wx:if="{{it.e}}" class="priceBox flexJ"><view class="flexA"><text>￥{{it.f}}</text><text wx:if="{{it.g}}" class="linePrice">122</text></view><view class="reality flexA"><view class="shi">{{it.h}}</view><text>￥</text><view class="price">{{it.i}}</view></view></view><view wx:else class="pointsShop"><block wx:if="{{it.j}}"><view class="flexJ" style="flex:1"><view class="flexA"><image src="/static/shopCarIc/pointsIc.png" mode=""></image><view class="pointsPrice">{{it.k}}</view></view><view class="num ellipsis">x{{it.l}}</view></view></block><block wx:else><text>{{it.m}}</text><image src="/static/shopCarIc/pointsIc.png" mode=""></image><view class="points">{{it.n}}</view><view class="pointsPrice">￥{{it.o}}</view></block></view></view></view>
@@ -41,6 +41,9 @@ @@ -41,6 +41,9 @@
41 } 41 }
42 .shop .info { 42 .shop .info {
43 width: 100%; 43 width: 100%;
  44 + display: flex;
  45 + flex-direction: column;
  46 + justify-content: space-between;
44 } 47 }
45 .shop .info .shopTitle { 48 .shop .info .shopTitle {
46 color: #323233ff; 49 color: #323233ff;
@@ -107,4 +110,8 @@ @@ -107,4 +110,8 @@
107 .shop .info .pointsShop .pointsPrice { 110 .shop .info .pointsShop .pointsPrice {
108 color: #ff3d3dff; 111 color: #ff3d3dff;
109 font-size: 26rpx; 112 font-size: 26rpx;
  113 +}
  114 +.linePrice {
  115 + text-decoration: line-through;
  116 + color: rgba(0, 0, 0, 0.3) !important;
110 } 117 }
@@ -74,7 +74,7 @@ const _sfc_main = { @@ -74,7 +74,7 @@ const _sfc_main = {
74 }; 74 };
75 const click = (e) => { 75 const click = (e) => {
76 console.log(e); 76 console.log(e);
77 - getOrderLists(e.index == 5 ? 21 : e.index); 77 + getOrderLists(e.index == 5 ? 21 : e.index == 4 ? 5 : e.index);
78 }; 78 };
79 const getOrderLists = async (status) => { 79 const getOrderLists = async (status) => {
80 try { 80 try {
@@ -185,19 +185,21 @@ const _sfc_main = { @@ -185,19 +185,21 @@ const _sfc_main = {
185 q: item.order_status == 3 185 q: item.order_status == 3
186 }, item.order_status == 3 ? common_vendor.e({ 186 }, item.order_status == 3 ? common_vendor.e({
187 r: item.order_status == 3 && item.goodstatus_text == "" 187 r: item.order_status == 3 && item.goodstatus_text == ""
188 - }, item.order_status == 3 && item.goodstatus_text == "" ? {} : {}, {  
189 - s: common_vendor.o(($event) => operateOrder(item, 3)) 188 + }, item.order_status == 3 && item.goodstatus_text == "" ? {
  189 + s: common_vendor.o(($event) => true)
  190 + } : {}, {
  191 + t: common_vendor.o(($event) => operateOrder(item, 3))
190 }) : {}, { 192 }) : {}, {
191 - t: item.order_status == 4  
192 - }, item.order_status == 4 ? {  
193 - v: common_vendor.o(($event) => operateOrder(item, 4)) 193 + v: item.order_status == 5
  194 + }, item.order_status == 5 ? {
  195 + w: common_vendor.o(($event) => operateOrder(item, 4))
194 } : {}, { 196 } : {}, {
195 - w: item.order_status == 21 197 + x: item.order_status == 21
196 }, item.order_status == 21 ? { 198 }, item.order_status == 21 ? {
197 - x: common_vendor.o(($event) => operateOrder(item, 5)) 199 + y: common_vendor.o(($event) => operateOrder(item, 5))
198 } : {}, { 200 } : {}, {
199 - y: item.id,  
200 - z: common_vendor.o(($event) => toDetaile(item.id), item.id) 201 + z: item.id,
  202 + A: common_vendor.o(($event) => toDetaile(item.id), item.id)
201 }); 203 });
202 }), 204 }),
203 e: !common_vendor.unref(orderList).length 205 e: !common_vendor.unref(orderList).length
1 -<view><u-navbar wx:if="{{a}}" u-i="67be9ace-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="tabs"><u-tabs wx:if="{{c}}" bindclick="{{b}}" u-i="67be9ace-1" bind:__l="__l" u-p="{{c}}"></u-tabs></view><view class="mainBox"><view wx:for="{{d}}" wx:for-item="item" wx:key="y" class="orderBox" bindtap="{{item.z}}"><view wx:if="{{item.a}}" class="downTime"><u-count-down wx:if="{{item.c}}" u-i="{{item.b}}" bind:__l="__l" u-p="{{item.c}}"></u-count-down></view><view wx:if="{{item.d}}" class="orderNoBox flexJ"><view class="orderNo">快递单号 {{item.e}}</view><view catchtap="{{item.f}}" class="copy">复制</view></view><order-shop wx:if="{{item.h}}" u-i="{{item.g}}" bind:__l="__l" u-p="{{item.h}}"></order-shop><view class="orderBtn"><view wx:if="{{item.i}}" class="flexA"><view catchtap="{{item.k}}" class="cancel flexC">{{item.j}}</view><view wx:if="{{item.l}}" catchtap="{{item.n}}" class="orange flexC">{{item.m}}</view></view><view wx:if="{{item.o}}" catchtap="{{item.p}}" class="orange flexC">申请退款</view><view wx:if="{{item.q}}" class="flexA"><view wx:if="{{item.r}}" class="cancel flexC"><button open-type="contact"></button> 联系客服 </view><view catchtap="{{item.s}}" class="orange flexC">确认收货</view></view><view wx:if="{{item.t}}" catchtap="{{item.v}}" class="orange flexC">评价</view><view wx:if="{{item.w}}" catchtap="{{item.x}}" class="orange flexC">查看详情</view></view></view></view><view wx:if="{{e}}" class="null flexV"><image src="/static/mineIc/orderNull.png" mode=""></image> 暂无订单 </view><pay-mode wx:if="{{g}}" bindcanclePop="{{f}}" u-i="67be9ace-4" bind:__l="__l" u-p="{{g}}"></pay-mode><tip-pops wx:if="{{i}}" bindpointsBtns="{{h}}" u-i="67be9ace-5" bind:__l="__l" u-p="{{i}}"></tip-pops></view>  
  1 +<view><u-navbar wx:if="{{a}}" u-i="67be9ace-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="tabs"><u-tabs wx:if="{{c}}" bindclick="{{b}}" u-i="67be9ace-1" bind:__l="__l" u-p="{{c}}"></u-tabs></view><view class="mainBox"><view wx:for="{{d}}" wx:for-item="item" wx:key="z" class="orderBox" bindtap="{{item.A}}"><view wx:if="{{item.a}}" class="downTime"><u-count-down wx:if="{{item.c}}" u-i="{{item.b}}" bind:__l="__l" u-p="{{item.c}}"></u-count-down></view><view wx:if="{{item.d}}" class="orderNoBox flexJ"><view class="orderNo">快递单号 {{item.e}}</view><view catchtap="{{item.f}}" class="copy">复制</view></view><order-shop wx:if="{{item.h}}" u-i="{{item.g}}" bind:__l="__l" u-p="{{item.h}}"></order-shop><view class="orderBtn"><view wx:if="{{item.i}}" class="flexA"><view catchtap="{{item.k}}" class="cancel flexC">{{item.j}}</view><view wx:if="{{item.l}}" catchtap="{{item.n}}" class="orange flexC">{{item.m}}</view></view><view wx:if="{{item.o}}" catchtap="{{item.p}}" class="orange flexC">申请退款</view><view wx:if="{{item.q}}" class="flexA"><view wx:if="{{item.r}}" class="cancel flexC" catchtap="{{item.s}}"><button open-type="contact"></button> 联系客服 </view><view catchtap="{{item.t}}" class="orange flexC">确认收货</view></view><view wx:if="{{item.v}}" catchtap="{{item.w}}" class="orange flexC">评价</view><view wx:if="{{item.x}}" catchtap="{{item.y}}" class="orange flexC">查看详情</view></view></view></view><view wx:if="{{e}}" class="null flexV"><image src="/static/mineIc/orderNull.png" mode=""></image> 暂无订单 </view><pay-mode wx:if="{{g}}" bindcanclePop="{{f}}" u-i="67be9ace-4" bind:__l="__l" u-p="{{g}}"></pay-mode><tip-pops wx:if="{{i}}" bindpointsBtns="{{h}}" u-i="67be9ace-5" bind:__l="__l" u-p="{{i}}"></tip-pops></view>
@@ -65,7 +65,7 @@ const _sfc_main = { @@ -65,7 +65,7 @@ const _sfc_main = {
65 const getScoreDetails = async () => { 65 const getScoreDetails = async () => {
66 try { 66 try {
67 const res = await api_index.getScoreDetail(); 67 const res = await api_index.getScoreDetail();
68 - recordList.value = res.mingxi; 68 + recordList.value = res;
69 console.log("getScoreDetail", res); 69 console.log("getScoreDetail", res);
70 } catch (err) { 70 } catch (err) {
71 common_vendor.index.showToast({ title: err, icon: "none" }); 71 common_vendor.index.showToast({ title: err, icon: "none" });
@@ -16,7 +16,24 @@ @@ -16,7 +16,24 @@
16 "libVersion": "2.32.3", 16 "libVersion": "2.32.3",
17 "appid": "wxd6feb65ac83ce679", 17 "appid": "wxd6feb65ac83ce679",
18 "projectname": "healthMall", 18 "projectname": "healthMall",
19 - "condition": {}, 19 + "condition": {
  20 + "search": {
  21 + "current": -1,
  22 + "list": []
  23 + },
  24 + "conversation": {
  25 + "current": -1,
  26 + "list": []
  27 + },
  28 + "game": {
  29 + "current": -1,
  30 + "list": []
  31 + },
  32 + "miniprogram": {
  33 + "current": -1,
  34 + "list": []
  35 + }
  36 + },
20 "editorSetting": { 37 "editorSetting": {
21 "tabIndent": "insertSpaces", 38 "tabIndent": "insertSpaces",
22 "tabSize": 2 39 "tabSize": 2
  1 +{
  2 + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
  3 + "condition": {
  4 + "miniprogram": {
  5 + "list": [
  6 + {
  7 + "name": "",
  8 + "pathName": "pages/mine/orderDetail",
  9 + "query": "id=197",
  10 + "launchMode": "default",
  11 + "scene": null
  12 + },
  13 + {
  14 + "name": "",
  15 + "pathName": "pages/mine/myOrder",
  16 + "query": "status=0",
  17 + "launchMode": "default",
  18 + "scene": null
  19 + }
  20 + ]
  21 + }
  22 + }
  23 +}