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

转到一个项目

作者 韩昌
提交 09cbdf0e75a50ac4a9ba41764dec6f9fd8523cc4 1 个父辈 5bac9d6d

修改：14.40

内嵌 并排对比
正在显示 17 个修改的文件 包含 196 行增加 和 129 行删除
@@ -49,7 +49,7 @@ const props = defineProps({ @@ -49,7 +49,7 @@ const props = defineProps({
49 // 余额 49 // 余额
50 balance: { 50 balance: {
51 type: String, 51 type: String,
52 - default: 0 52 + default: ''
53 }, 53 },
54 // 是否订单支付 54 // 是否订单支付
55 isOrderPay: { 55 isOrderPay: {
@@ -68,14 +68,14 @@ const props = defineProps({ @@ -68,14 +68,14 @@ const props = defineProps({
68 }) 68 })
69 onMounted(() => { 69 onMounted(() => {
70 setTimeout(() => { 70 setTimeout(() => {
71 - if (props.totalPrice > props.balance) { 71 + if (props.totalPrice > +props.balance) {
72 payMode[1].shows = false 72 payMode[1].shows = false
73 } 73 }
74 }, 100) 74 }, 100)
75 }) 75 })
76 watchEffect(() => { 76 watchEffect(() => {
77 - // console.log('余额',props.balance) 余额不足点击充值，返回页面刷新余额  
78 - if (props.totalPrice < props.balance) { 77 + console.log('余额', props.balance) //余额不足点击充值，返回页面刷新余额
  78 + if (props.totalPrice < +props.balance) {
79 payMode[1].shows = true 79 payMode[1].shows = true
80 } 80 }
81 }) 81 })
@@ -128,12 +128,12 @@ const getPays = async () => { @@ -128,12 +128,12 @@ const getPays = async () => {
128 const res = await getPay(params) 128 const res = await getPay(params)
129 proxy.$methods.pay(res) 129 proxy.$methods.pay(res)
130 canclePop() 130 canclePop()
131 - // console.log('getPay', res)  
132 - // uni.showToast({ title: '支付成功', icon: 'none' })  
133 - // setTimeout(() => {  
134 - // uni.navigateBack()  
135 -  
136 - // }, 1500); 131 + if (defaultMode.value === 1) {
  132 + uni.showToast({ title: '支付成功', icon: 'none' })
  133 + setTimeout(() => {
  134 + uni.navigateBack()
  135 + }, 1500)
  136 + }
137 // 保存数据 137 // 保存数据
138 } catch (err) { 138 } catch (err) {
139 uni.showToast({ title: err, icon: 'none' }) 139 uni.showToast({ title: err, icon: 'none' })
@@ -7,14 +7,14 @@ @@ -7,14 +7,14 @@
7 <view class="info"> 7 <view class="info">
8 <view class="topBox"> 8 <view class="topBox">
9 <view class="shopTitle ellipsis">{{ it.goods_name }}</view> 9 <view class="shopTitle ellipsis">{{ it.goods_name }}</view>
10 - <view class="desc ellipsis">{{ it.describe }}</view> 10 + <view class="desc ellipsis">{{ it.goods_attr ? it.goods_attr : '' }}</view>
11 <view class="num ellipsis" v-if="![2].includes(shop.order_status)">x{{ it.total_num }}</view> 11 <view class="num ellipsis" v-if="![2].includes(shop.order_status)">x{{ it.total_num }}</view>
12 </view> 12 </view>
13 <!-- 非积分商品 --> 13 <!-- 非积分商品 -->
14 <view class="priceBox flexJ" v-if="it.goodstatus != 3"> 14 <view class="priceBox flexJ" v-if="it.goodstatus != 3">
15 - <view class="flexA">  
16 - <text>￥{{ it.total_price }}</text>  
17 - <text v-if="shop.goodstatus_text === 2" class="linePrice">122</text> 15 + <view class="">
  16 + <text>￥{{ it.goods_price }}</text>
  17 + <text v-if="shop.goodstatus_text === 2" class="linePrice">{{ it.line_price }}</text>
18 </view> 18 </view>
19 <view class="reality flexA"> 19 <view class="reality flexA">
20 <view class="shi">{{ textHandler(shop.order_status) }}</view> 20 <view class="shi">{{ textHandler(shop.order_status) }}</view>
@@ -56,7 +56,7 @@ const props = defineProps({ @@ -56,7 +56,7 @@ const props = defineProps({
56 } 56 }
57 }) 57 })
58 58
59 -const textHandler = orderStatus => ([1, 11].includes(orderStatus) ? '需付款：' : [2, 3, 4, 21].includes(orderStatus) ? '实付款：' : '') 59 +const textHandler = orderStatus => ([1, 11].includes(orderStatus) ? '需付款:' : [2, 3, 4, 21].includes(orderStatus) ? '实付款:' : '')
60 60
61 onMounted(() => { 61 onMounted(() => {
62 nextTick(() => { 62 nextTick(() => {
@@ -173,5 +173,6 @@ onMounted(() => { @@ -173,5 +173,6 @@ onMounted(() => {
173 .linePrice { 173 .linePrice {
174 text-decoration: line-through; 174 text-decoration: line-through;
175 color: rgba($color: #000000, $alpha: 0.3) !important; 175 color: rgba($color: #000000, $alpha: 0.3) !important;
  176 + display: block;
176 } 177 }
177 </style> 178 </style>
@@ -62,8 +62,8 @@ @@ -62,8 +62,8 @@
62 <image :src="item.icon" mode=""></image> 62 <image :src="item.icon" mode=""></image>
63 <u-badge :absolute="true" v-if="index == 2" :offset="[-6, -6]" color="#fff" bgColor="#F63D3A" max="99" :value="value"></u-badge> 63 <u-badge :absolute="true" v-if="index == 2" :offset="[-6, -6]" color="#fff" bgColor="#F63D3A" max="99" :value="value"></u-badge>
64 </view> 64 </view>
65 - <text v-if="index != 1">{{ item.name }}</text>  
66 - <button v-if="index == 1" open-type="contact">{{ item.name }}</button> 65 + <text>{{ item.name }}</text>
  66 + <button open-type="contact" v-if="index === 1"></button>
67 </view> 67 </view>
68 </view> 68 </view>
69 <view class="flexA" v-if="shopType != 3"> 69 <view class="flexA" v-if="shopType != 3">
@@ -72,7 +72,14 @@ @@ -72,7 +72,14 @@
72 </view> 72 </view>
73 <view v-else class="exchange flexC" @click="toOrder(3)">我要兑换</view> 73 <view v-else class="exchange flexC" @click="toOrder(3)">我要兑换</view>
74 </view> 74 </view>
75 - <popPay :moreSpec="moreSpec" :shopDetail="detaileList" @close="payPopShow = false" :shopType="shopType" :btnType="btnType" :payPopShow="payPopShow"></popPay> 75 + <popPay
  76 + :moreSpec="moreSpec"
  77 + :shopDetail="detaileList"
  78 + @close="payPopShow = false"
  79 + :shopType="shopType"
  80 + :btnType="btnType"
  81 + :payPopShow="payPopShow"
  82 + ></popPay>
76 </view> 83 </view>
77 </template> 84 </template>
78 85
@@ -91,7 +98,11 @@ onHide(() => { @@ -91,7 +98,11 @@ onHide(() => {
91 payPopShow.value = false 98 payPopShow.value = false
92 }) 99 })
93 const currentNum = ref(0) 100 const currentNum = ref(0)
94 -const list6 = reactive(['https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper3.png', 'https://cdn.uviewui.com/uview/swiper/swiper1.png']) 101 +const list6 = reactive([
  102 + 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
  103 + 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
  104 + 'https://cdn.uviewui.com/uview/swiper/swiper1.png'
  105 +])
95 const icList = reactive([ 106 const icList = reactive([
96 { id: 1, name: '店铺', icon: '/static/indexIc/shopIc.png' }, 107 { id: 1, name: '店铺', icon: '/static/indexIc/shopIc.png' },
97 { id: 2, name: '客服', icon: '/static/indexIc/service.png' }, 108 { id: 2, name: '客服', icon: '/static/indexIc/service.png' },
@@ -260,6 +271,7 @@ const getShopDetailes = async id => { @@ -260,6 +271,7 @@ const getShopDetailes = async id => {
260 271
261 .leftIc { 272 .leftIc {
262 margin-right: 34rpx; 273 margin-right: 34rpx;
  274 + position: relative;
263 275
264 .images { 276 .images {
265 position: relative; 277 position: relative;
@@ -279,11 +291,14 @@ const getShopDetailes = async id => { @@ -279,11 +291,14 @@ const getShopDetailes = async id => {
279 } 291 }
280 292
281 button { 293 button {
282 - position: relative; 294 + position: absolute;
  295 + bottom: 0;
  296 + left: 0;
  297 + top: 0;
  298 + right: 0;
283 background: transparent; 299 background: transparent;
284 - width: 100%;  
285 - height: 100%;  
286 - color: #323233ff; 300 + /* width: 48rpx;
  301 + height: 48rpx; */
287 font-size: 20rpx; 302 font-size: 20rpx;
288 border: none !important; 303 border: none !important;
289 padding: 0 !important; 304 padding: 0 !important;
@@ -219,7 +219,7 @@ page { @@ -219,7 +219,7 @@ page {
219 .downTime { 219 .downTime {
220 display: flex; 220 display: flex;
221 justify-content: flex-end; 221 justify-content: flex-end;
222 - margin-bottom: 58rpx; 222 + margin-bottom: 12rpx;
223 223
224 .u-count-down__text { 224 .u-count-down__text {
225 color: #fc4338ff; 225 color: #fc4338ff;
@@ -19,14 +19,15 @@ @@ -19,14 +19,15 @@
19 <image :src="item.image" mode=""></image> 19 <image :src="item.image" mode=""></image>
20 </view> 20 </view>
21 <view class="shopInfo"> 21 <view class="shopInfo">
22 - <view class="shopName ellipsis">{{item.name}}</view>  
23 - <view class="shopDesc ellipsis">{{item.describe}}</view> 22 + <view class="shopName ellipsis">{{ item.name }}</view>
  23 + <view class="shopDesc ellipsis">{{ item.describe }}</view>
24 <view class="price flexJ"> 24 <view class="price flexJ">
25 - <text v-if="shopType!=3">￥{{item.goods_price}}</text> 25 + <text v-if="shopType != 3">￥{{ item.goods_price }}</text>
26 <view v-else class="flexA points"> 26 <view v-else class="flexA points">
27 - {{orderInfo.coscore}}<text>积分</text> 27 + {{ orderInfo.coscore }}
  28 + <text>积分</text>
28 </view> 29 </view>
29 - <view class="num">x{{item.total_num}}</view> 30 + <view class="num">x{{ item.total_num }}</view>
30 </view> 31 </view>
31 </view> 32 </view>
32 </view> 33 </view>
@@ -35,44 +36,54 @@ @@ -35,44 +36,54 @@
35 <text>提货方式</text> 36 <text>提货方式</text>
36 <view class="mode">快递配送</view> 37 <view class="mode">快递配送</view>
37 </view> 38 </view>
38 - <view class="modeBox flexJ" v-if="shopType==3"> 39 + <view class="modeBox flexJ" v-if="shopType == 3">
39 <text>运费</text> 40 <text>运费</text>
40 - <view class="yunPrice">￥{{orderInfo.express_price}}</view> 41 + <view class="yunPrice">￥{{ orderInfo.express_price }}</view>
41 </view> 42 </view>
42 </view> 43 </view>
43 <view class="btnsBox iosAuto flexJ"> 44 <view class="btnsBox iosAuto flexJ">
44 <!-- 积分购买 --> 45 <!-- 积分购买 -->
45 - <view class="pointsPrcie flexV" v-if="shopType==3"> 46 + <view class="pointsPrcie flexV" v-if="shopType == 3">
46 <view class="allPoints flexA"> 47 <view class="allPoints flexA">
47 <view class="all">合计:</view> 48 <view class="all">合计:</view>
48 <view class="pointsNum"> 49 <view class="pointsNum">
49 - {{orderInfo.coscore}}<text>积分</text> 50 + {{ orderInfo.coscore }}
  51 + <text>积分</text>
50 </view> 52 </view>
51 </view> 53 </view>
52 - <view class="pointsMoeny">{{orderInfo.express_price}}元</view> 54 + <view class="pointsMoeny">{{ orderInfo.express_price }}元</view>
53 </view> 55 </view>
54 <!-- 非积分购买 --> 56 <!-- 非积分购买 -->
55 <view class="allMoney flexA" v-else> 57 <view class="allMoney flexA" v-else>
56 - <text>总价：</text> {{orderInfo.total_price}} 58 + <text>总价：</text>
  59 + {{ orderInfo.total_price }}
57 </view> 60 </view>
58 - <view class="btn flexC" @click="btns">{{ shopType==3 ? '立即兑换' : '立即购买' }}</view> 61 + <view class="btn flexC" @click="btns">{{ shopType == 3 ? '立即兑换' : '立即购买' }}</view>
59 </view> 62 </view>
60 <!-- 选择支付方式弹窗 --> 63 <!-- 选择支付方式弹窗 -->
61 - <payMode @canclePop="modeShow = false" :car_Id="car_Id" :balance="balance" :totalPrice="orderInfo.total_price" :adressId="adress.id" :payParams="payParams" :modeShow="modeShow"></payMode> 64 + <payMode
  65 + @canclePop="modeShow = false"
  66 + :car_Id="car_Id"
  67 + :balance="balance"
  68 + :totalPrice="orderInfo.total_price"
  69 + :adressId="adress.id"
  70 + :payParams="payParams"
  71 + :modeShow="modeShow"
  72 + ></payMode>
62 <!-- 确认积分兑换弹窗 --> 73 <!-- 确认积分兑换弹窗 -->
63 <tipPop @pointsBtns="pointsBtns" :integral="orderInfo.coscore" :tipShow="tipShow"></tipPop> 74 <tipPop @pointsBtns="pointsBtns" :integral="orderInfo.coscore" :tipShow="tipShow"></tipPop>
64 </view> 75 </view>
65 </template> 76 </template>
66 77
67 <script setup> 78 <script setup>
68 - import { ref,reactive } from 'vue'  
69 - import {onShow,onLoad} from '@dcloudio/uni-app'  
70 - import payMode from '@/componets/checkPayMode.vue'  
71 - import tipPop from '@/componets/tipPop.vue'  
72 - import shopAddres from '@/componets/address.vue'  
73 - import { getbBuyData,getCarsettlement } from '@/api/'  
74 - onLoad((e)=> {  
75 - if(e.ids) { 79 +import { ref, reactive } from 'vue'
  80 +import { onShow, onLoad } from '@dcloudio/uni-app'
  81 +import payMode from '@/componets/checkPayMode.vue'
  82 +import tipPop from '@/componets/tipPop.vue'
  83 +import shopAddres from '@/componets/address.vue'
  84 +import { getbBuyData, getCarsettlement, getyue } from '@/api/'
  85 +onLoad(e => {
  86 + if (e.ids) {
76 car_Id.value = e.ids 87 car_Id.value = e.ids
77 getCarsettlements(e.ids) //购物车结算 88 getCarsettlements(e.ids) //购物车结算
78 } else { 89 } else {
@@ -82,26 +93,27 @@ @@ -82,26 +93,27 @@
82 console.log(e.params, '商品规格信息') 93 console.log(e.params, '商品规格信息')
83 } 94 }
84 //默认地址 95 //默认地址
85 - uni.getStorageSync('defaultAdres') ? adress.value = uni.getStorageSync('defaultAdres') : ''  
86 - })  
87 - onShow(()=> { 96 + uni.getStorageSync('defaultAdres') ? (adress.value = uni.getStorageSync('defaultAdres')) : ''
  97 +})
  98 +onShow(() => {
88 // 余额 99 // 余额
89 - uni.getStorageSync('balance') ? balance.value = uni.getStorageSync('balance') : ''  
90 - })  
91 - let modeShow = ref(false) //选择支付方式  
92 - let payParams = ref({}) //支付参数  
93 - let shopType = ref(1)// 1=普通商品,2=特价商品,3=积分商品  
94 - let car_Id = ref('') //购物车结算商品的购物车id  
95 - let balance = ref(0) //余额  
96 - let buyShop = ref([]) //购买de商品  
97 - let orderInfo = ref({}) //购买信息  
98 - // 购买商品信息  
99 - const getbBuyDatas = async (obj)=>{ 100 + getyues()
  101 + // uni.getStorageSync('balance') ? balance.value = uni.getStorageSync('balance') : ''
  102 +})
  103 +let modeShow = ref(false) //选择支付方式
  104 +let payParams = ref({}) //支付参数
  105 +let shopType = ref(1) // 1=普通商品,2=特价商品,3=积分商品
  106 +let car_Id = ref('') //购物车结算商品的购物车id
  107 +let balance = ref(0) //余额
  108 +let buyShop = ref([]) //购买de商品
  109 +let orderInfo = ref({}) //购买信息
  110 +// 购买商品信息
  111 +const getbBuyDatas = async obj => {
100 try { 112 try {
101 let params = { 113 let params = {
102 - goods_id:obj.id, //integer 是 商品ID  
103 - num:obj.num, //integer 是 数量  
104 - goods_spec_id:obj.specId, //integer 是 规格ID 114 + goods_id: obj.id, //integer 是 商品ID
  115 + num: obj.num, //integer 是 数量
  116 + goods_spec_id: obj.specId //integer 是 规格ID
105 } 117 }
106 const res = await getbBuyData(params) 118 const res = await getbBuyData(params)
107 buyShop.value = res.goods_list //购买de商品 119 buyShop.value = res.goods_list //购买de商品
@@ -109,12 +121,24 @@ @@ -109,12 +121,24 @@
109 console.log('getbBuyData', res) 121 console.log('getbBuyData', res)
110 // 保存数据 122 // 保存数据
111 } catch (err) { 123 } catch (err) {
112 - uni.showToast({ title:err,icon:'none' }) 124 + uni.showToast({ title: err, icon: 'none' })
113 console.log('getbBuyData', err) 125 console.log('getbBuyData', err)
114 } 126 }
  127 +}
  128 +
  129 +const getyues = async () => {
  130 + try {
  131 + const res = await getyue()
  132 + balance.value = res.money
  133 + // 保存数据
  134 + } catch (err) {
  135 + uni.showToast({ title: err, icon: 'none' })
  136 + console.log('getyue', err)
115 } 137 }
116 - // 购物车结算  
117 - const getCarsettlements = async (ids)=>{ 138 +}
  139 +
  140 +// 购物车结算
  141 +const getCarsettlements = async ids => {
118 try { 142 try {
119 const res = await getCarsettlement(ids) 143 const res = await getCarsettlement(ids)
120 buyShop.value = res.goods_list //购买de商品 144 buyShop.value = res.goods_list //购买de商品
@@ -122,52 +146,51 @@ @@ -122,52 +146,51 @@
122 console.log('getCarsettlement', res) 146 console.log('getCarsettlement', res)
123 // 保存数据 147 // 保存数据
124 } catch (err) { 148 } catch (err) {
125 - uni.showToast({ title:err,icon:'none' }) 149 + uni.showToast({ title: err, icon: 'none' })
126 console.log('getCarsettlement', err) 150 console.log('getCarsettlement', err)
127 } 151 }
128 - }  
129 - let adress = ref({}) //收货地址  
130 - // 选择地址  
131 - const checkAddress = ()=> { 152 +}
  153 +let adress = ref({}) //收货地址
  154 +// 选择地址
  155 +const checkAddress = () => {
132 uni.navigateTo({ 156 uni.navigateTo({
133 url: `/pages/mine/myAddress?isCheck=${1}`, 157 url: `/pages/mine/myAddress?isCheck=${1}`,
134 events: { 158 events: {
135 steBack: data => { 159 steBack: data => {
136 adress.value = data 160 adress.value = data
137 - console.log('地址',data) 161 + console.log('地址', data)
138 } 162 }
139 } 163 }
140 }) 164 })
141 - }  
142 - // 是否使用积分弹窗  
143 - const tipShow = ref(false)  
144 - // 是否使用积分 0否 1 是  
145 - const pointsBtns = (type)=>{ 165 +}
  166 +// 是否使用积分弹窗
  167 +const tipShow = ref(false)
  168 +// 是否使用积分 0否 1 是
  169 +const pointsBtns = type => {
146 tipShow.value = false 170 tipShow.value = false
147 - if(type == 1) { 171 + if (type == 1) {
148 modeShow.value = true 172 modeShow.value = true
149 } 173 }
150 - }  
151 - // 立即购买按钮 shopType== 1 || 2立即购买 == shopType==3立即兑换按钮  
152 - const btns = ()=> {  
153 - if(shopType.value==3) { 174 +}
  175 +// 立即购买按钮 shopType== 1 || 2立即购买 == shopType==3立即兑换按钮
  176 +const btns = () => {
  177 + if (shopType.value == 3) {
154 console.log('立即兑换按钮') 178 console.log('立即兑换按钮')
155 - if(uni.getStorageSync('myPoints') < orderInfo.value.coscore)  
156 - return uni.showToast({ title:'您的积分不足~',icon:'none' }) 179 + if (uni.getStorageSync('myPoints') < orderInfo.value.coscore) return uni.showToast({ title: '您的积分不足~', icon: 'none' })
157 tipShow.value = true 180 tipShow.value = true
158 } else { 181 } else {
159 modeShow.value = true 182 modeShow.value = true
160 console.log('立即购买') 183 console.log('立即购买')
161 } 184 }
162 - } 185 +}
163 </script> 186 </script>
164 187
165 <style lang="scss"> 188 <style lang="scss">
166 - page {  
167 - background: #F6F8FA;  
168 - } 189 +page {
  190 + background: #f6f8fa;
  191 +}
169 192
170 - .mainBox { 193 +.mainBox {
171 width: 100%; 194 width: 100%;
172 padding: 20rpx 24rpx 0; 195 padding: 20rpx 24rpx 0;
173 box-sizing: border-box; 196 box-sizing: border-box;
@@ -329,9 +352,9 @@ @@ -329,9 +352,9 @@
329 } 352 }
330 } 353 }
331 } 354 }
332 - } 355 +}
333 356
334 - .btnsBox { 357 +.btnsBox {
335 position: fixed; 358 position: fixed;
336 left: 0; 359 left: 0;
337 bottom: 0; 360 bottom: 0;
@@ -368,7 +391,6 @@ @@ -368,7 +391,6 @@
368 margin-left: 32rpx; 391 margin-left: 32rpx;
369 392
370 .allPoints { 393 .allPoints {
371 -  
372 .all { 394 .all {
373 color: #000000ff; 395 color: #000000ff;
374 font-size: 30rpx; 396 font-size: 30rpx;
@@ -394,5 +416,5 @@ @@ -394,5 +416,5 @@
394 font-size: 24rpx; 416 font-size: 24rpx;
395 } 417 }
396 } 418 }
397 - } 419 +}
398 </style> 420 </style>
@@ -30,7 +30,7 @@ const _sfc_main = { @@ -30,7 +30,7 @@ const _sfc_main = {
30 }, 30 },
31 balance: { 31 balance: {
32 type: String, 32 type: String,
33 - default: 0 33 + default: ""
34 }, 34 },
35 isOrderPay: { 35 isOrderPay: {
36 type: Boolean, 36 type: Boolean,
@@ -50,13 +50,14 @@ const _sfc_main = { @@ -50,13 +50,14 @@ const _sfc_main = {
50 const props = __props; 50 const props = __props;
51 common_vendor.onMounted(() => { 51 common_vendor.onMounted(() => {
52 setTimeout(() => { 52 setTimeout(() => {
53 - if (props.totalPrice > props.balance) { 53 + if (props.totalPrice > +props.balance) {
54 payMode[1].shows = false; 54 payMode[1].shows = false;
55 } 55 }
56 }, 100); 56 }, 100);
57 }); 57 });
58 common_vendor.watchEffect(() => { 58 common_vendor.watchEffect(() => {
59 - if (props.totalPrice < props.balance) { 59 + console.log("\u4F59\u989D", props.balance);
  60 + if (props.totalPrice < +props.balance) {
60 payMode[1].shows = true; 61 payMode[1].shows = true;
61 } 62 }
62 }); 63 });
@@ -99,6 +100,12 @@ const _sfc_main = { @@ -99,6 +100,12 @@ const _sfc_main = {
99 const res = await api_index.getPay(params); 100 const res = await api_index.getPay(params);
100 proxy.$methods.pay(res); 101 proxy.$methods.pay(res);
101 canclePop(); 102 canclePop();
  103 + if (defaultMode.value === 1) {
  104 + common_vendor.index.showToast({ title: "\u652F\u4ED8\u6210\u529F", icon: "none" });
  105 + setTimeout(() => {
  106 + common_vendor.index.navigateBack();
  107 + }, 1500);
  108 + }
102 } catch (err) { 109 } catch (err) {
103 common_vendor.index.showToast({ title: err, icon: "none" }); 110 common_vendor.index.showToast({ title: err, icon: "none" });
104 console.log("getPay", err); 111 console.log("getPay", err);
@@ -9,7 +9,7 @@ const _sfc_main = { @@ -9,7 +9,7 @@ const _sfc_main = {
9 }, 9 },
10 setup(__props) { 10 setup(__props) {
11 const props = __props; 11 const props = __props;
12 - const textHandler = (orderStatus) => [1, 11].includes(orderStatus) ? "\u9700\u4ED8\u6B3E\uFF1A" : [2, 3, 4, 21].includes(orderStatus) ? "\u5B9E\u4ED8\u6B3E\uFF1A" : ""; 12 + const textHandler = (orderStatus) => [1, 11].includes(orderStatus) ? "\u9700\u4ED8\u6B3E:" : [2, 3, 4, 21].includes(orderStatus) ? "\u5B9E\u4ED8\u6B3E:" : "";
13 common_vendor.onMounted(() => { 13 common_vendor.onMounted(() => {
14 common_vendor.nextTick(() => { 14 common_vendor.nextTick(() => {
15 console.log(props.shop, "\u8BA2\u5355\u6570\u636E\u662F\u4EC0\u4E48"); 15 console.log(props.shop, "\u8BA2\u5355\u6570\u636E\u662F\u4EC0\u4E48");
@@ -21,28 +21,30 @@ const _sfc_main = { @@ -21,28 +21,30 @@ 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) 24 + c: common_vendor.t(it.goods_attr ? it.goods_attr : "")
25 }, ![2].includes(__props.shop.order_status) ? { 25 }, ![2].includes(__props.shop.order_status) ? {
26 d: common_vendor.t(it.total_num) 26 d: common_vendor.t(it.total_num)
27 } : {}, { 27 } : {}, {
28 e: it.goodstatus != 3 28 e: it.goodstatus != 3
29 }, it.goodstatus != 3 ? common_vendor.e({ 29 }, it.goodstatus != 3 ? common_vendor.e({
30 - f: common_vendor.t(it.total_price), 30 + f: common_vendor.t(it.goods_price),
31 g: __props.shop.goodstatus_text === 2 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) 32 + }, __props.shop.goodstatus_text === 2 ? {
  33 + h: common_vendor.t(it.line_price)
  34 + } : {}, {
  35 + i: common_vendor.t(textHandler(__props.shop.order_status)),
  36 + j: common_vendor.t(it.total_price)
35 }) : common_vendor.e({ 37 }) : common_vendor.e({
36 - j: [2].includes(__props.shop.order_status) 38 + k: [2].includes(__props.shop.order_status)
37 }, [2].includes(__props.shop.order_status) ? { 39 }, [2].includes(__props.shop.order_status) ? {
38 - k: common_vendor.t(__props.shop.score),  
39 - l: common_vendor.t(it.total_num) 40 + l: common_vendor.t(__props.shop.score),
  41 + m: common_vendor.t(it.total_num)
40 } : { 42 } : {
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) 43 + n: common_vendor.t(textHandler(__props.shop.order_status)),
  44 + o: common_vendor.t(it.coscore),
  45 + p: common_vendor.t(it.diff_price)
44 }), { 46 }), {
45 - p: it.id 47 + q: it.id
46 }); 48 });
47 }), 49 }),
48 b: ![2].includes(__props.shop.order_status) 50 b: ![2].includes(__props.shop.order_status)
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>  
  1 +<view wx:for="{{a}}" wx:for-item="it" wx:key="q" 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=""><text>￥{{it.f}}</text><text wx:if="{{it.g}}" class="linePrice">{{it.h}}</text></view><view class="reality flexA"><view class="shi">{{it.i}}</view><text>￥</text><view class="price">{{it.j}}</view></view></view><view wx:else class="pointsShop"><block wx:if="{{it.k}}"><view class="flexJ" style="flex:1"><view class="flexA"><image src="/static/shopCarIc/pointsIc.png" mode=""></image><view class="pointsPrice">{{it.l}}</view></view><view class="num ellipsis">x{{it.m}}</view></view></block><block wx:else><text>{{it.n}}</text><image src="/static/shopCarIc/pointsIc.png" mode=""></image><view class="points">{{it.o}}</view><view class="pointsPrice">￥{{it.p}}</view></block></view></view></view>
@@ -114,4 +114,5 @@ @@ -114,4 +114,5 @@
114 .linePrice { 114 .linePrice {
115 text-decoration: line-through; 115 text-decoration: line-through;
116 color: rgba(0, 0, 0, 0.3) !important; 116 color: rgba(0, 0, 0, 0.3) !important;
  117 + display: block;
117 } 118 }
@@ -27,7 +27,11 @@ const _sfc_main = { @@ -27,7 +27,11 @@ const _sfc_main = {
27 payPopShow.value = false; 27 payPopShow.value = false;
28 }); 28 });
29 const currentNum = common_vendor.ref(0); 29 const currentNum = common_vendor.ref(0);
30 - common_vendor.reactive(["https://cdn.uviewui.com/uview/swiper/swiper2.png", "https://cdn.uviewui.com/uview/swiper/swiper3.png", "https://cdn.uviewui.com/uview/swiper/swiper1.png"]); 30 + common_vendor.reactive([
  31 + "https://cdn.uviewui.com/uview/swiper/swiper2.png",
  32 + "https://cdn.uviewui.com/uview/swiper/swiper3.png",
  33 + "https://cdn.uviewui.com/uview/swiper/swiper1.png"
  34 + ]);
31 const icList = common_vendor.reactive([ 35 const icList = common_vendor.reactive([
32 { id: 1, name: "\u5E97\u94FA", icon: "/static/indexIc/shopIc.png" }, 36 { id: 1, name: "\u5E97\u94FA", icon: "/static/indexIc/shopIc.png" },
33 { id: 2, name: "\u5BA2\u670D", icon: "/static/indexIc/service.png" }, 37 { id: 2, name: "\u5BA2\u670D", icon: "/static/indexIc/service.png" },
@@ -134,16 +138,11 @@ const _sfc_main = { @@ -134,16 +138,11 @@ const _sfc_main = {
134 value: value.value 138 value: value.value
135 }) 139 })
136 } : {}, { 140 } : {}, {
137 - e: index != 1  
138 - }, index != 1 ? {  
139 - f: common_vendor.t(item.name)  
140 - } : {}, {  
141 - g: index == 1  
142 - }, index == 1 ? {  
143 - h: common_vendor.t(item.name)  
144 - } : {}, {  
145 - i: item.id,  
146 - j: common_vendor.o(($event) => btns(index), item.id) 141 + e: common_vendor.t(item.name),
  142 + f: index === 1
  143 + }, index === 1 ? {} : {}, {
  144 + g: item.id,
  145 + h: common_vendor.o(($event) => btns(index), item.id)
147 }); 146 });
148 }), 147 }),
149 r: common_vendor.unref(shopType) != 3 148 r: common_vendor.unref(shopType) != 3
1 -<view><u-navbar wx:if="{{a}}" u-s="{{['left']}}" u-i="1a35f0c9-0" bind:__l="__l" u-p="{{a}}"><view class="u-nav-slot" slot="left"><image src="/static/indexIc/back.png" mode=""></image></view></u-navbar><view class="swiperBox"><u-swiper wx:if="{{f}}" u-s="{{['indicator']}}" bindchange="{{e}}" u-i="1a35f0c9-1" bind:__l="__l" u-p="{{f}}"><view slot="indicator"><view wx:if="{{b}}" class="indicator-num"><text class="indicator-num__text">{{c}}/{{d}}</text></view></view></u-swiper></view><view class="info"><shop-info wx:if="{{g}}" u-i="1a35f0c9-2" bind:__l="__l" u-p="{{g}}"></shop-info></view><view class="line"></view><view class="mainBox"><view wx:if="{{h}}"><view class="commentNmu flexJ"><text>评论({{i}})</text><view wx:if="{{j}}" class="see flexA" bindtap="{{k}}"> 查看全部 <image src="/static/indexIc/orangeRight.png" mode=""></image></view></view><view wx:if="{{l}}"><comment wx:if="{{m}}" u-i="1a35f0c9-3" bind:__l="__l" u-p="{{m}}"></comment></view><view wx:else class="commentNull flexV"><image src="/static/indexIc/cpmmentNull.png" mode=""></image> 暂无评论 </view></view><view wx:if="{{n}}"><view class="line"></view><view class="titles">商品详情</view><rich-text nodes="{{o}}"></rich-text></view></view><view wx:if="{{p}}" class="lineBox flexC"><view class="lines"></view><text>商品详情</text><view class="lines"></view></view><view class="" style="height:300rpx"></view><view class="btnBox iosAuto flexJ"><view class="left flexA"><view wx:for="{{q}}" wx:for-item="item" wx:key="i" class="leftIc flexV" bindtap="{{item.j}}"><view class="images"><image src="{{item.a}}" mode=""></image><u-badge wx:if="{{item.b}}" u-i="{{item.c}}" bind:__l="__l" u-p="{{item.d}}"></u-badge></view><text wx:if="{{item.e}}">{{item.f}}</text><button wx:if="{{item.g}}" open-type="contact">{{item.h}}</button></view></view><view wx:if="{{r}}" class="flexA"><view class="add flexC" bindtap="{{s}}">加入购物车</view><view class="buy flexC" bindtap="{{t}}">立即购买</view></view><view wx:else class="exchange flexC" bindtap="{{v}}">我要兑换</view></view><pop-pay wx:if="{{x}}" bindclose="{{w}}" u-i="1a35f0c9-5" bind:__l="__l" u-p="{{x}}"></pop-pay></view>  
  1 +<view><u-navbar wx:if="{{a}}" u-s="{{['left']}}" u-i="1a35f0c9-0" bind:__l="__l" u-p="{{a}}"><view class="u-nav-slot" slot="left"><image src="/static/indexIc/back.png" mode=""></image></view></u-navbar><view class="swiperBox"><u-swiper wx:if="{{f}}" u-s="{{['indicator']}}" bindchange="{{e}}" u-i="1a35f0c9-1" bind:__l="__l" u-p="{{f}}"><view slot="indicator"><view wx:if="{{b}}" class="indicator-num"><text class="indicator-num__text">{{c}}/{{d}}</text></view></view></u-swiper></view><view class="info"><shop-info wx:if="{{g}}" u-i="1a35f0c9-2" bind:__l="__l" u-p="{{g}}"></shop-info></view><view class="line"></view><view class="mainBox"><view wx:if="{{h}}"><view class="commentNmu flexJ"><text>评论({{i}})</text><view wx:if="{{j}}" class="see flexA" bindtap="{{k}}"> 查看全部 <image src="/static/indexIc/orangeRight.png" mode=""></image></view></view><view wx:if="{{l}}"><comment wx:if="{{m}}" u-i="1a35f0c9-3" bind:__l="__l" u-p="{{m}}"></comment></view><view wx:else class="commentNull flexV"><image src="/static/indexIc/cpmmentNull.png" mode=""></image> 暂无评论 </view></view><view wx:if="{{n}}"><view class="line"></view><view class="titles">商品详情</view><rich-text nodes="{{o}}"></rich-text></view></view><view wx:if="{{p}}" class="lineBox flexC"><view class="lines"></view><text>商品详情</text><view class="lines"></view></view><view class="" style="height:300rpx"></view><view class="btnBox iosAuto flexJ"><view class="left flexA"><view wx:for="{{q}}" wx:for-item="item" wx:key="g" class="leftIc flexV" bindtap="{{item.h}}"><view class="images"><image src="{{item.a}}" mode=""></image><u-badge wx:if="{{item.b}}" u-i="{{item.c}}" bind:__l="__l" u-p="{{item.d}}"></u-badge></view><text>{{item.e}}</text><button wx:if="{{item.f}}" open-type="contact"></button></view></view><view wx:if="{{r}}" class="flexA"><view class="add flexC" bindtap="{{s}}">加入购物车</view><view class="buy flexC" bindtap="{{t}}">立即购买</view></view><view wx:else class="exchange flexC" bindtap="{{v}}">我要兑换</view></view><pop-pay wx:if="{{x}}" bindclose="{{w}}" u-i="1a35f0c9-5" bind:__l="__l" u-p="{{x}}"></pop-pay></view>
@@ -118,6 +118,7 @@ @@ -118,6 +118,7 @@
118 } 118 }
119 .btnBox .left .leftIc { 119 .btnBox .left .leftIc {
120 margin-right: 34rpx; 120 margin-right: 34rpx;
  121 + position: relative;
121 } 122 }
122 .btnBox .left .leftIc .images { 123 .btnBox .left .leftIc .images {
123 position: relative; 124 position: relative;
@@ -134,11 +135,14 @@ @@ -134,11 +135,14 @@
134 font-size: 20rpx; 135 font-size: 20rpx;
135 } 136 }
136 .btnBox .left .leftIc button { 137 .btnBox .left .leftIc button {
137 - position: relative; 138 + position: absolute;
  139 + bottom: 0;
  140 + left: 0;
  141 + top: 0;
  142 + right: 0;
138 background: transparent; 143 background: transparent;
139 - width: 100%;  
140 - height: 100%;  
141 - color: #323233ff; 144 + /* width: 48rpx;
  145 + height: 48rpx; */
142 font-size: 20rpx; 146 font-size: 20rpx;
143 border: none !important; 147 border: none !important;
144 padding: 0 !important; 148 padding: 0 !important;
@@ -48,7 +48,7 @@ page { @@ -48,7 +48,7 @@ page {
48 .mainBox .orderBox .downTime { 48 .mainBox .orderBox .downTime {
49 display: flex; 49 display: flex;
50 justify-content: flex-end; 50 justify-content: flex-end;
51 - margin-bottom: 58rpx; 51 + margin-bottom: 12rpx;
52 } 52 }
53 .mainBox .orderBox .downTime .u-count-down__text { 53 .mainBox .orderBox .downTime .u-count-down__text {
54 color: #fc4338ff; 54 color: #fc4338ff;
@@ -28,7 +28,7 @@ const _sfc_main = { @@ -28,7 +28,7 @@ const _sfc_main = {
28 common_vendor.index.getStorageSync("defaultAdres") ? adress.value = common_vendor.index.getStorageSync("defaultAdres") : ""; 28 common_vendor.index.getStorageSync("defaultAdres") ? adress.value = common_vendor.index.getStorageSync("defaultAdres") : "";
29 }); 29 });
30 common_vendor.onShow(() => { 30 common_vendor.onShow(() => {
31 - common_vendor.index.getStorageSync("balance") ? balance.value = common_vendor.index.getStorageSync("balance") : ""; 31 + getyues();
32 }); 32 });
33 let modeShow = common_vendor.ref(false); 33 let modeShow = common_vendor.ref(false);
34 let payParams = common_vendor.ref({}); 34 let payParams = common_vendor.ref({});
@@ -53,6 +53,15 @@ const _sfc_main = { @@ -53,6 +53,15 @@ const _sfc_main = {
53 console.log("getbBuyData", err); 53 console.log("getbBuyData", err);
54 } 54 }
55 }; 55 };
  56 + const getyues = async () => {
  57 + try {
  58 + const res = await api_index.getyue();
  59 + balance.value = res.money;
  60 + } catch (err) {
  61 + common_vendor.index.showToast({ title: err, icon: "none" });
  62 + console.log("getyue", err);
  63 + }
  64 + };
56 const getCarsettlements = async (ids) => { 65 const getCarsettlements = async (ids) => {
57 try { 66 try {
58 const res = await api_index.getCarsettlement(ids); 67 const res = await api_index.getCarsettlement(ids);
1 -<u-navbar wx:if="{{a}}" u-i="0a9b88e7-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="mainBox"><view wx:if="{{b}}" class="checkAddress flexJ" bindtap="{{c}}"><view class="add flexA"><image src="/static/shopCarIc/address.png" mode=""></image> 新增收货地址 </view><image src="/static/mineIc/gayRight.png" mode=""></image></view><view wx:else><shop-addres wx:if="{{d}}" u-i="0a9b88e7-1" bind:__l="__l" u-p="{{d}}"></shop-addres></view><view class="ordersShop"><view wx:for="{{e}}" wx:for-item="item" wx:key="g" class="shop flexJ"><view class="shopPhoto"><image src="{{item.a}}" mode=""></image></view><view class="shopInfo"><view class="shopName ellipsis">{{item.b}}</view><view class="shopDesc ellipsis">{{item.c}}</view><view class="price flexJ"><text wx:if="{{f}}">￥{{item.d}}</text><view wx:else class="flexA points">{{item.e}}<text>积分</text></view><view class="num">x{{item.f}}</view></view></view></view><view class="line"></view><view class="modeBox flexJ"><text>提货方式</text><view class="mode">快递配送</view></view><view wx:if="{{g}}" class="modeBox flexJ"><text>运费</text><view class="yunPrice">￥{{h}}</view></view></view><view class="btnsBox iosAuto flexJ"><view wx:if="{{i}}" class="pointsPrcie flexV"><view class="allPoints flexA"><view class="all">合计:</view><view class="pointsNum">{{j}}<text>积分</text></view></view><view class="pointsMoeny">{{k}}元</view></view><view wx:else class="allMoney flexA"><text>总价：</text> {{l}}</view><view class="btn flexC" bindtap="{{n}}">{{m}}</view></view><pay-mode wx:if="{{p}}" bindcanclePop="{{o}}" u-i="0a9b88e7-2" bind:__l="__l" u-p="{{p}}"></pay-mode><tip-pop wx:if="{{r}}" bindpointsBtns="{{q}}" u-i="0a9b88e7-3" bind:__l="__l" u-p="{{r}}"></tip-pop></view>  
  1 +<u-navbar wx:if="{{a}}" u-i="0a9b88e7-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="mainBox"><view wx:if="{{b}}" class="checkAddress flexJ" bindtap="{{c}}"><view class="add flexA"><image src="/static/shopCarIc/address.png" mode=""></image> 新增收货地址 </view><image src="/static/mineIc/gayRight.png" mode=""></image></view><view wx:else><shop-addres wx:if="{{d}}" u-i="0a9b88e7-1" bind:__l="__l" u-p="{{d}}"></shop-addres></view><view class="ordersShop"><view wx:for="{{e}}" wx:for-item="item" wx:key="g" class="shop flexJ"><view class="shopPhoto"><image src="{{item.a}}" mode=""></image></view><view class="shopInfo"><view class="shopName ellipsis">{{item.b}}</view><view class="shopDesc ellipsis">{{item.c}}</view><view class="price flexJ"><text wx:if="{{f}}">￥{{item.d}}</text><view wx:else class="flexA points">{{item.e}} <text>积分</text></view><view class="num">x{{item.f}}</view></view></view></view><view class="line"></view><view class="modeBox flexJ"><text>提货方式</text><view class="mode">快递配送</view></view><view wx:if="{{g}}" class="modeBox flexJ"><text>运费</text><view class="yunPrice">￥{{h}}</view></view></view><view class="btnsBox iosAuto flexJ"><view wx:if="{{i}}" class="pointsPrcie flexV"><view class="allPoints flexA"><view class="all">合计:</view><view class="pointsNum">{{j}} <text>积分</text></view></view><view class="pointsMoeny">{{k}}元</view></view><view wx:else class="allMoney flexA"><text>总价：</text> {{l}}</view><view class="btn flexC" bindtap="{{n}}">{{m}}</view></view><pay-mode wx:if="{{p}}" bindcanclePop="{{o}}" u-i="0a9b88e7-2" bind:__l="__l" u-p="{{p}}"></pay-mode><tip-pop wx:if="{{r}}" bindpointsBtns="{{q}}" u-i="0a9b88e7-3" bind:__l="__l" u-p="{{r}}"></tip-pop></view>
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 /* 透明度 */ 25 /* 透明度 */
26 /* 文章场景相关 */ 26 /* 文章场景相关 */
27 page { 27 page {
28 - background: #F6F8FA; 28 + background: #f6f8fa;
29 } 29 }
30 .mainBox { 30 .mainBox {
31 width: 100%; 31 width: 100%;
@@ -16,6 +16,13 @@ @@ -16,6 +16,13 @@
16 "query": "status=0", 16 "query": "status=0",
17 "launchMode": "default", 17 "launchMode": "default",
18 "scene": null 18 "scene": null
  19 + },
  20 + {
  21 + "name": "",
  22 + "pathName": "pages/index/shopDetaile",
  23 + "query": "id=107",
  24 + "launchMode": "default",
  25 + "scene": null
19 } 26 }
20 ] 27 ]
21 } 28 }