fix

virgo.wzfrontend/workark_wx/pages.json

@@ -93,20 +93,21 @@
 			"style": {
 				"navigationBarTitleText": "提交订单"
 			}
-		},
-		{
-			"path" : "addressList/addressList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "收货地址"
-			}
-		},
-		{
-			"path" : "addressAdd/addressAdd",
-			"style" : 
-			{
-				"navigationBarTitleText" : "填写地址"
-			}
+		}, {
+			"path": "addressList/addressList",
+			"style": {
+				"navigationBarTitleText": "收货地址"
+			}
+		}, {
+			"path": "addressAdd/addressAdd",
+			"style": {
+				"navigationBarTitleText": "填写地址"
+			}
+		}, {
+			"path": "orderList/orderList",
+			"style": {
+				"navigationBarTitleText": "订单列表"
+			}
 		}]
 	}, {
 		"root": "subPages/indexPage",

virgo.wzfrontend/workark_wx/pages/my/my.vue

@@ -12,9 +12,9 @@
 			</view>
 			<view class="my-list">
 				<view class="my-list-box">
-					<view class="my-item" @tap="$navigateTo('/subPages/shopPage/webview/webview?url=/order')">
+					<view class="my-item" @tap="$navigateTo('/subPages/shopPage/orderList/orderList')">
 						<view class="my-icon bg3">
-							<uv-icon name="home-fill" color="#fff" size="28"></uv-icon>
+							<uv-icon name="order" color="#fff" size="28"></uv-icon>
 						</view>
 						<view class="item-content">
 							商城订单
@@ -25,7 +25,7 @@
 					</view>
 					<view class="my-item" @tap="$navigateTo('/subPages/myPage/organization/organization')">
 						<view class="my-icon bg3">
-							<uv-icon name="home-fill" color="#fff" size="28"></uv-icon>
+							<uv-icon name="home" color="#fff" size="28"></uv-icon>
 						</view>
 						<view class="item-content">
 							我的公司
@@ -36,7 +36,7 @@
 					</view>
 					<view class="my-item" @tap="$navigateTo('/subPages/myPage/download/download')">
 						<view class="my-icon bg5">
-							<uv-icon name="grid-fill" color="#fff" size="28"></uv-icon>
+							<uv-icon name="attach" color="#fff" size="28"></uv-icon>
 						</view>
 						<view class="item-content">
 							我的下载

virgo.wzfrontend/workark_wx/pages/shop/shop.vue

@@ -4,7 +4,7 @@
 			<uv-tabs :list="navList" @click="changeNav" :scrollable="false"></uv-tabs>
 		</uv-sticky>
 		<uv-swiper keyName="image" :list="topicList" height="200" radius="0" imgMode="scaleToFill"></uv-swiper>
-		<view>
+		<view v-if="hotList.length>0">
 			<view class="gl-title">热门推荐</view>
 			<uv-list>
 				<uv-list-item v-for="(item,index) in hotList" :key="item.id" border>
@@ -24,7 +24,7 @@
 				</uv-list-item>
 			</uv-list>
 		</view>
-		<view>
+		<view v-if="newList.length>0">
 			<view class="gl-title">新品推荐</view>
 			<uv-list>
 				<uv-list-item v-for="(item,index) in newList" :key="item.id" border
@@ -45,6 +45,16 @@
 				</uv-list-item>
 			</uv-list>
 		</view>
+		<view class="shop-cart">
+			<view class="cartbox" @click="$navigateTo('/subPages/shopPage/cart/cart')">
+				<uv-badge :value="cartCount" type="error" :offset="[0,0]" max="99" numberType="overflow" absolute
+					:customStyle="{
+						zIndex:99
+					}">
+				</uv-badge>
+				<uv-icon name="shopping-cart" size="30"></uv-icon>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -53,7 +63,8 @@
 		getCategoryList,
 		getTopicList,
 		getSearchHot,
-		getSearchNew
+		getSearchNew,
+		getCartCount
 	} from '@/request/api/shop.js'
 	export default {
 		data() {
@@ -61,14 +72,16 @@
 				navList: [],
 				newList: [],
 				hotList: [],
-				topicList: []
+				topicList: [],
+				cartCount: 0
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.init()
 		},
 		methods: {
 			async init() {
+				if (uni.getStorageSync('shopMobileToken')) this.getCartCount();
 				let navData = await getCategoryList();
 				if (navData.state) {
 					let navList = navData.data;
@@ -81,6 +94,10 @@
 				this.queryGoods();
 				this.queryTopic();
 			},
+			async getCartCount() {
+				let countData = await getCartCount();
+				if (countData.state) this.cartCount = countData.data;
+			},
 			changeNav(index) {
 
 			},
@@ -129,6 +146,25 @@
 		}
 	}
 
+	.shop-cart {
+		position: fixed;
+		bottom: 80rpx;
+		right: 30rpx;
+		width: 100rpx;
+		height: 100rpx;
+
+		.cartbox {
+			width: 100%;
+			height: 100%;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			box-shadow: 0px 2px 10px rgba(3, 3, 3, 0.1);
+			background-color: #ffffff;
+		}
+	}
+
 	.gl-body {
 		background: #fff;
 	}
@@ -138,6 +174,7 @@
 	}
 
 	.gl-item {
+		width: 100%;
 		display: flex;
 		align-items: center;
 	}

virgo.wzfrontend/workark_wx/request/api/shop.js

@@ -203,6 +203,17 @@ export function setDefaultAddress(id, e) {
 		method: 'post'
 	})
 }
+/* 
+ * 提交订单
+ * 
+ * 
+ */
+export function saveOrder(idAddress, idCarts) {
+	return request({
+		url: `${baseUrl}/user/order/save?idAddress=${idAddress}&idCarts=${idCarts}`,
+		method: 'post'
+	})
+}
 /* 
  * 获取订单信息
  * 

virgo.wzfrontend/workark_wx/subPages/shopPage/checkout/checkout.vue

@@ -48,7 +48,8 @@
 
 <script>
 	import {
-		getRequest
+		getRequest,
+		saveOrder
 	} from '@/request/api/shop.js'
 	export default {
 		data() {
@@ -106,9 +107,10 @@
 				return (price / 100).toFixed(2)
 			},
 			chooseAddr() {
-				this.$navigateTo('/subPages/shopPage/addressList/addressList?choose=true&chooseAddrId=' + this.chooseAddrId);
+				this.$navigateTo('/subPages/shopPage/addressList/addressList?choose=true&chooseAddrId=' + this
+					.chooseAddrId);
 			},
-			submit() {
+			async submit() {
 				if (!this.addr || !this.addr.tel || this.addr.tel == '') {
 					this.$u.toast('请选择收货地址')
 					return
@@ -121,19 +123,16 @@
 					idAddress: this.chooseAddrId,
 					idCarts: idCarts
 				}
-				this.$u.post('user/order/save?idAddress=' + this.chooseAddrId + '&idCarts=' + idCarts).then(res => {
-					const order = res
-					uni.setStorageSync('chooseAddrId', undefined)
-					uni.getStorageSync('idCarts', undefined)
-					this.$u.route({
-						url: '/pages/order/payment/payment',
-						params: {
-							orderSn: order.orderSn,
-							totalPrice: order.totalPrice
-						}
-					})
-				});
-
+				let saveData = await saveOrder(this.chooseAddrId, idCarts);
+				if (saveData.state) {
+					const order = saveData.data;
+					uni.setStorageSync('chooseAddrId', undefined);
+					uni.getStorageSync('idCarts', undefined);
+					uni.redirectTo({
+						url: '/subPages/shopPage/payment/payment?orderSn=' + order.orderSn + '&totalPrice=' +
+							order.totalPrice
+					});
+				}
 			}
 		}
 	}

virgo.wzfrontend/workark_wx/subPages/shopPage/orderList/orderList.vue

@@ -0,0 +1,603 @@
+<template>
+	<view>
+		<view class="wrap">
+			<view class="uv-tabs-box">
+				<uv-tabs ref="tabs" :list="list" :current="current" @change="change" :scrollable="false">
+				</uv-tabs>
+			</view>
+			<swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish">
+				<swiper-item class="swiper-item">
+					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
+						<view class="no-data" v-if="orders[0].length ===0 ">
+							<uv-empty
+								icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
+								:isImg="true" textSize="14" width="180" text="暂无订单">
+							</uv-empty>
+						</view>
+						<view class="page-box" v-else>
+							<view class="order" v-for="(res, index) in orders[0]" :key="res.id">
+								<view class="top" @click="toDetail(res.orderSn)">
+									<view class="left">
+										<uv-icon name="home" :size="30" color="rgb(94,94,94)"></uv-icon>
+										<view class="store">{{ res.orderSn }}</view>
+										<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></uv-icon>
+									</view>
+									<view class="right">{{ res.statusName }}</view>
+								</view>
+								<view class="item" v-for="(item, index) in res.items" :key="index"
+									@click="toDetail(res.orderSn)">
+									<view class="left">
+										<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
+									</view>
+									<view class="content">
+										<view class="title uv-line-2">{{ item.goods.name }} </view>
+										<view class="type">{{ item.title }}</view>
+										<view class="delivery-time">付款后5天内发货</view>
+									</view>
+									<view class="right">
+										<view class="price">
+											￥{{ formatPrice(item.price) }}
+										</view>
+										<view class="number">x{{ item.count }}</view>
+									</view>
+								</view>
+								<view class="total" @click="toDetail(res.orderSn)">
+									共{{ totalNum(res.items) }}件商品 合计:
+									<text class="total-price">
+										￥{{ formatPrice(res.totalPrice) }}
+									</text>
+								</view>
+								<view class="bottom">
+									<view class="more">
+										<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"></uv-icon> -->
+									</view>
+									<view class="logistics btn" @click="cancel(res.orderSn)">取消订单</view>
+									<view class="evaluate btn" @click="pay(res.orderSn,totalPrice(res.items)*100)">立即付款
+									</view>
+								</view>
+							</view>
+							<uv-loadmore :status="loadStatus[0]" bgColor="#f2f2f2"></uv-loadmore>
+						</view>
+					</scroll-view>
+				</swiper-item>
+				<swiper-item class="swiper-item">
+					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
+						<view class="no-data" v-if="orders[1].length ===0 ">
+							<uv-empty
+								icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
+								:isImg="true" textSize="14" width="180" text="暂无订单">
+							</uv-empty>
+						</view>
+						<view class="page-box" v-else>
+							<view class="order" v-for="(res, index) in orders[1]" :key="res.id">
+								<view class="top" @click="toDetail(res.orderSn)">
+									<view class="left">
+										<uv-icon name="home" :size="30" color="rgb(94,94,94)"></uv-icon>
+										<view class="store">{{ res.orderSn }}</view>
+										<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></uv-icon>
+									</view>
+									<view class="right">{{ res.statusName }}</view>
+								</view>
+								<view class="item" v-for="(item, index) in res.items" :key="index"
+									@click="toDetail(res.orderSn)">
+									<view class="left">
+										<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
+									</view>
+									<view class="content">
+										<view class="title uv-line-2">{{ item.goods.name }} </view>
+										<view class="type">{{ item.title }}</view>
+										<view class="delivery-time">付款后5天内发货</view>
+									</view>
+									<view class="right">
+										<view class="price">
+											￥{{ formatPrice(item.price) }}
+										</view>
+										<view class="number">x{{ item.count }}</view>
+									</view>
+								</view>
+								<view class="total" @click="toDetail(res.orderSn)">
+									共{{ totalNum(res.items) }}件商品 合计:
+									<text class="total-price">
+										￥{{ totalPrice(res.items) }}
+
+									</text>
+								</view>
+								<view class="bottom">
+									<view class="more">
+										<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"></uv-icon> -->
+									</view>
+									<view class="evaluate btn" @click="notify(res.orderSn)">提醒发货</view>
+								</view>
+							</view>
+							<uv-loadmore :status="loadStatus[1]" bgColor="#f2f2f2"></uv-loadmore>
+						</view>
+					</scroll-view>
+				</swiper-item>
+				<swiper-item class="swiper-item">
+					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
+						<view class="no-data" v-if="orders[2].length ===0 ">
+							<uv-empty
+								icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
+								:isImg="true" textSize="14" width="180" text="暂无订单">
+							</uv-empty>
+						</view>
+						<view class="page-box" v-else>
+							<view class="order" v-for="(res, index) in  orders[2]" :key="res.id">
+								<view class="top" @click="toDetail(res.orderSn)">
+									<view class="left">
+										<uv-icon name="home" :size="30" color="rgb(94,94,94)"></uv-icon>
+										<view class="store">{{ res.orderSn }}</view>
+										<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></uv-icon>
+									</view>
+									<view class="right">{{ res.statusName }}</view>
+								</view>
+								<view class="item" v-for="(item, index) in res.items" :key="index"
+									@click="toDetail(res.orderSn)">
+									<view class="left">
+										<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
+									</view>
+									<view class="content">
+										<view class="title uv-line-2">{{ item.goods.name }} </view>
+										<view class="type">{{ item.title }}</view>
+										<view class="delivery-time">付款后5天内发货</view>
+									</view>
+									<view class="right">
+										<view class="price">
+											￥{{ formatPrice(item.price) }}
+										</view>
+										<view class="number">x{{ item.count }}</view>
+									</view>
+								</view>
+								<view class="total" @click="toDetail(res.orderSn)">
+									共{{ totalNum(res.items) }}件商品 合计:
+									<text class="total-price">
+										￥{{ totalPrice(res.items) }}
+									</text>
+								</view>
+								<view class="bottom">
+									<view class="more">
+										<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"></uv-icon> -->
+									</view>
+									<view class="logistics btn" @click="expressInfo(res.orderSn)">查看物流</view>
+									<view class="evaluate btn" @click="confirm(res.orderSn)">确认收货</view>
+								</view>
+							</view>
+							<uv-loadmore :status="loadStatus[2]" bgColor="#f2f2f2"></uv-loadmore>
+						</view>
+					</scroll-view>
+				</swiper-item>
+				<swiper-item class="swiper-item">
+					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
+						<view class="no-data" v-if="orders[3].length ===0 ">
+							<uv-empty
+								icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
+								:isImg="true" textSize="14" width="180" text="暂无订单">
+							</uv-empty>
+						</view>
+						<view class="page-box" v-else>
+							<view class="order" v-for="(res, index) in  orders[3]" :key="res.id">
+								<view class="top" @click="toDetail(res.orderSn)">
+									<view class="left">
+										<uv-icon name="home" :size="30" color="rgb(94,94,94)"></uv-icon>
+										<view class="store">{{ res.orderSn }}</view>
+										<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></uv-icon>
+									</view>
+									<view class="right">{{ res.statusName }}</view>
+								</view>
+								<view class="item" v-for="(item, index) in res.items" :key="index"
+									@click="toDetail(res.orderSn)">
+									<view class="left">
+										<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
+									</view>
+									<view class="content">
+										<view class="title uv-line-2">{{ item.goods.name }} </view>
+										<view class="type">{{ item.title }}</view>
+										<view class="delivery-time">已确认收货</view>
+									</view>
+									<view class="right">
+										<view class="price">
+											￥{{ formatPrice(item.price) }}
+										</view>
+										<view class="number">x{{ item.count }}</view>
+									</view>
+								</view>
+								<view class="total" @click="toDetail(res.orderSn)">
+									共{{ totalNum(res.items) }}件商品 合计:
+									<text class="total-price">
+										￥{{ totalPrice(res.items) }}
+
+									</text>
+								</view>
+								<view class="bottom">
+									<view class="more">
+										<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"  ></uv-icon> -->
+									</view>
+									<view class="logistics btn" @click="expressInfo(res.orderSn)">查看物流</view>
+									<view class="evaluate btn" @click="comment(res.orderSn)">评价</view>
+								</view>
+							</view>
+							<uv-loadmore :status="loadStatus[3]" bgColor="#f2f2f2"></uv-loadmore>
+						</view>
+					</scroll-view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<uv-modal v-model="showCancel" content="确认取消该订单?" :show-cancel-button="true" @confirm="cancelOrder"></uv-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		getRequest
+	} from '@/request/api/shop.js'
+	export default {
+		data() {
+			return {
+				showCancel: false,
+				cancelOrderSn: '',
+				orders: [
+					[],
+					[],
+					[],
+					[]
+				],
+				listQuery: {
+					page: 1,
+					limit: 20
+				},
+				list: [{
+					name: '待付款'
+				}, {
+					name: '待发货'
+				}, {
+					name: '待收货'
+				}, {
+					name: '待评价'
+				}],
+				current: 0,
+				swiperCurrent: 0,
+				tabsHeight: 0,
+				dx: 0,
+				loadStatus: ['loadmore', 'loadmore', 'loadmore', 'loadmore'],
+			};
+		},
+		onLoad() {
+			//待付款
+			this.getOrders(1);
+			//待发货
+			this.getOrders(2);
+			//已发货
+			this.getOrders(3);
+			//已完成
+			this.getOrders(4);
+		},
+		computed: {
+			// 价格小数
+			priceDecimal() {
+				return val => {
+					if (val !== parseInt(val)) {
+						return val.slice(-2)
+					} else {
+						return '00'
+					}
+				};
+			},
+			// 价格整数
+			priceInt() {
+				return val => {
+					if (val !== parseInt(val)) return val.split('.')[0]
+					else return val
+				};
+			}
+
+		},
+		methods: {
+			reachBottom() {
+				const current = this.current
+				if (this.loadStatus[current] == 'nomore') {
+					return
+				}
+				this.listQuery.page++
+				this.getOrders(current + 1)
+			},
+			getOrders(status) {
+				const page = this.listQuery.page
+				const limit = this.listQuery.limit
+				this.orders[status - 1] = new Array()
+				this.loadStatus.splice(status - 1, 1, "loading")
+				getRequest('user/order/getOrders?page=' + page + '&limit=' + limit + '&status=' + status).then(res => {
+					if (res.state) {
+						let orderList = res.data.records
+						for (let index in orderList) {
+							let order = orderList[index]
+							order.title = '' + order.createTime
+							order.descript = '' + order.orderSn
+							this.orders[status - 1].push(order)
+						}
+						if (orderList.length < limit) {
+							this.loadStatus.splice(status - 1, 1, "nomore");
+						} else {
+							this.loadStatus.splice(status - 1, 1, "more");
+						}
+					}
+				});
+			},
+			formatPrice(val) {
+				return (val / 100).toFixed(2)
+			},
+			// 总价
+			totalPrice(item) {
+				let price = 0
+				item.map(val => {
+					price += val.price
+				});
+				return this.formatPrice(price)
+			},
+			// 总件数
+			totalNum(item) {
+				let num = 0;
+				if (item) {
+					item.map(val => {
+						if (val.number) {
+							num += val.number
+						}
+						if (val.count) {
+							num += val.count
+						}
+					});
+				}
+				return num;
+			},
+			// tab栏切换
+			change(index) {
+				this.swiperCurrent = index
+			},
+			transition({
+				detail: {
+					dx
+				}
+			}) {
+				this.$refs.tabs.setDx(dx)
+			},
+			animationfinish({
+				detail: {
+					current
+				}
+			}) {
+				this.swiperCurrent = current;
+				this.current = current;
+			},
+			toHome() {
+				this.$u.route({
+					type: 'switchTab',
+					url: '/pages/shop/index'
+				})
+			},
+			toDetail(orderSn) {
+				this.$u.route({
+					url: '/pages/order/detail',
+					params: {
+						orderSn: orderSn
+					}
+				})
+			},
+			cancel(orderNo) {
+				this.showCancel = true
+				this.cancelOrderSn = orderNo
+			},
+			cancelOrder() {
+				this.$u.post('user/order/cancel/' + this.cancelOrderSn).then(res => {
+					this.getOrders(1)
+				})
+			},
+			expressInfo(orderNo) {
+				console.log('查看物流信息', orderNo)
+				this.$u.route({
+					url: '/pages/order/express',
+					params: {
+						orderSn: orderNo
+					}
+				})
+			},
+			confirm(orderNo) {
+				console.log('确认收货', orderNo)
+				this.$u.post('user/order/confirm/' + orderNo).then(res => {
+					this.getOrders(3)
+				});
+			},
+			notify(orderSn) {
+				console.log('提醒发货', orderSn)
+				this.$u.toast('敬请期待')
+			},
+			pay(orderNo, totalPrice) {
+				this.$u.route({
+					url: '/pages/order/payment/payment',
+					params: {
+						orderSn: orderNo,
+						totalPrice: totalPrice
+					}
+				})
+			},
+			comment(orderSn) {
+				console.log('评论', orderSn)
+				this.$u.toast('敬请期待')
+			}
+		}
+	};
+</script>
+
+<style>
+	/* #ifndef H5 */
+	page {
+		height: 100%;
+		background-color: #f2f2f2;
+	}
+
+	/* #endif */
+</style>
+
+<style lang="scss" scoped>
+	.uv-tabs-box {
+		background: #ffffff;
+	}
+
+	.order {
+		width: 98%;
+		background-color: #ffffff;
+		margin: 1%;
+		border-radius: 10rpx;
+		box-sizing: border-box;
+		padding: 20rpx;
+		font-size: 28rpx;
+
+		.top {
+			display: flex;
+			justify-content: space-between;
+
+			.left {
+				display: flex;
+				align-items: center;
+
+				.store {
+					margin: 0 10rpx;
+					font-size: 32rpx;
+					font-weight: bold;
+				}
+			}
+
+			.right {
+				color: $uv-error-dark;
+			}
+		}
+
+		.item {
+			display: flex;
+			margin: 20rpx 0 0;
+
+			.left {
+				margin-right: 20rpx;
+
+				image {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 10rpx;
+				}
+			}
+
+			.content {
+				flex: 1;
+
+				.title {
+					font-size: 28rpx;
+					line-height: 50rpx;
+				}
+
+				.type {
+					margin: 10rpx 0;
+					font-size: 24rpx;
+					color: $uv-tips-color;
+				}
+
+				.delivery-time {
+					color: #e5d001;
+					font-size: 24rpx;
+				}
+			}
+
+			.right {
+				margin-left: 10rpx;
+				padding-top: 20rpx;
+				text-align: right;
+
+				.decimal {
+					font-size: 24rpx;
+					margin-top: 4rpx;
+				}
+
+				.number {
+					color: $uv-tips-color;
+					font-size: 24rpx;
+				}
+			}
+		}
+
+		.total {
+			margin-top: 20rpx;
+			text-align: right;
+			font-size: 24rpx;
+
+			.total-price {
+				font-size: 32rpx;
+			}
+		}
+
+		.bottom {
+			display: flex;
+			margin-top: 40rpx;
+			padding: 0 10rpx;
+			justify-content: flex-end;
+			align-items: center;
+
+			.btn {
+				margin-left: 20rpx;
+				line-height: 52rpx;
+				width: 160rpx;
+				border-radius: 26rpx;
+				border: 2rpx solid $uv-border-color;
+				font-size: 26rpx;
+				text-align: center;
+				color: $uv-info-dark;
+			}
+
+			.evaluate {
+				color: $uv-warning-dark;
+				border-color: $uv-warning-dark;
+			}
+		}
+	}
+
+	.centre {
+		text-align: center;
+		margin: 200rpx auto;
+		font-size: 32rpx;
+
+		image {
+			width: 164rpx;
+			height: 164rpx;
+			border-radius: 50%;
+			margin-bottom: 20rpx;
+		}
+
+		.tips {
+			font-size: 24rpx;
+			color: #999999;
+			margin-top: 20rpx;
+		}
+
+		.btn {
+			margin: 80rpx auto;
+			width: 200rpx;
+			border-radius: 32rpx;
+			line-height: 64rpx;
+			color: #ffffff;
+			font-size: 26rpx;
+			background: linear-gradient(270deg, rgba(249, 116, 90, 1) 0%, rgba(255, 158, 1, 1) 100%);
+		}
+	}
+
+	.wrap {
+		display: flex;
+		flex-direction: column;
+		height: calc(100vh - var(--window-top));
+		width: 100%;
+	}
+
+	.swiper-box {
+		flex: 1;
+	}
+
+	.swiper-item {
+		height: 100%;
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/shopPage/payment/payment.vue

@@ -29,7 +29,7 @@
 							<uv-col :span="11">
 								<view class="top">
 									<view class="name">
-										<uv-icon name="weixin-fill" size="60" color="#6cac3e"></uv-icon>
+										<uv-icon name="weixin-fill" size="30" color="#6cac3e"></uv-icon>
 									</view>
 									<view class="label">
 										微信支付
@@ -37,7 +37,7 @@
 								</view>
 							</uv-col>
 							<uv-col :span="1">
-								<uv-radio :name="res.name" iconSize="32" size="36"></uv-radio>
+								<uv-radio :name="res.name"></uv-radio>
 							</uv-col>
 						</uv-row>
 					</view>

virgo.wzfrontend/workark_wx/uni_modules/uv-tabs/components/uv-tabs/uv-tabs.vue

@@ -3,35 +3,18 @@
 		<view class="uv-tabs__wrapper">
 			<slot name="left" />
 			<view class="uv-tabs__wrapper__scroll-view-wrapper">
-				<scroll-view
-					:scroll-x="scrollable"
-					:scroll-left="scrollLeft"
-					scroll-with-animation
-					class="uv-tabs__wrapper__scroll-view"
-					:show-scrollbar="false"
-					ref="uv-tabs__wrapper__scroll-view"
-				>
-					<view
-						class="uv-tabs__wrapper__nav"
-						ref="uv-tabs__wrapper__nav"
-						:style="{
+				<scroll-view :scroll-x="scrollable" :scroll-left="scrollLeft" scroll-with-animation
+					class="uv-tabs__wrapper__scroll-view" :show-scrollbar="false" ref="uv-tabs__wrapper__scroll-view">
+					<view class="uv-tabs__wrapper__nav" ref="uv-tabs__wrapper__nav" :style="{
 							flex: scrollable ? '' : 1
-						}"
-					>
-						<view
-							class="uv-tabs__wrapper__nav__item"
-							v-for="(item, index) in list"
-							:key="index"
-							@tap="clickHandler(item, index)"
-							:ref="`uv-tabs__wrapper__nav__item-${index}`"
+						}">
+						<view class="uv-tabs__wrapper__nav__item" v-for="(item, index) in list" :key="index"
+							@tap="clickHandler(item, index)" :ref="`uv-tabs__wrapper__nav__item-${index}`"
 							:style="[{flex: scrollable ? '' : 1},$uv.addStyle(itemStyle)]"
-							:class="[`uv-tabs__wrapper__nav__item-${index}`, item.disabled && 'uv-tabs__wrapper__nav__item--disabled']"
-						>
-							<text
-								:class="[item.disabled && 'uv-tabs__wrapper__nav__item__text--disabled']"
+							:class="[`uv-tabs__wrapper__nav__item-${index}`, item.disabled && 'uv-tabs__wrapper__nav__item--disabled']">
+							<text :class="[item.disabled && 'uv-tabs__wrapper__nav__item__text--disabled']"
 								class="uv-tabs__wrapper__nav__item__text"
-								:style="[textStyle(index)]"
-							>{{ item[keyName] }}</text>
+								:style="[textStyle(index)]">{{ item[keyName] }}</text>
 							<uv-badge
 								:show="!!(item.badge && (item.badge.show || item.badge.isDot || item.badge.value))"
 								:isDot="item.badge && item.badge.isDot || propsBadge.isDot"
@@ -44,37 +27,28 @@
 								:shape="item.badge && item.badge.shape || propsBadge.shape"
 								:numberType="item.badge && item.badge.numberType || propsBadge.numberType"
 								:inverted="item.badge && item.badge.inverted || propsBadge.inverted"
-								customStyle="margin-left: 4px;"
-							></uv-badge>
+								customStyle="margin-left: 4px;"></uv-badge>
 						</view>
 						<!-- #ifdef APP-NVUE -->
-						<view
-							class="uv-tabs__wrapper__nav__line"
-							ref="uv-tabs__wrapper__nav__line"
-							:style="[{
+						<view class="uv-tabs__wrapper__nav__line" ref="uv-tabs__wrapper__nav__line" :style="[{
 								width: $uv.addUnit(lineWidth),
 								height: firstTime?0:$uv.addUnit(lineHeight),
 								background: lineColor,
 								backgroundSize: lineBgSize
-							}]"
-						>
+							}]">
 						<!-- #endif -->
-						<!-- #ifndef APP-NVUE -->
-						<view
-							class="uv-tabs__wrapper__nav__line"
-							ref="uv-tabs__wrapper__nav__line"
-							:style="[{
+							<!-- #ifndef APP-NVUE -->
+							<view class="uv-tabs__wrapper__nav__line" ref="uv-tabs__wrapper__nav__line" :style="[{
 									width: $uv.addUnit(lineWidth),
 									transform: `translate(${lineOffsetLeft}px)`,
 									transitionDuration: `${firstTime ? 0 : duration}ms`,
 									height: firstTime?0:$uv.addUnit(lineHeight),
 									background: lineColor,
 									backgroundSize: lineBgSize,
-								}]"
-						>
-						<!-- #endif -->
+								}]">
+							<!-- #endif -->
+							</view>
 						</view>
-					</view>
 				</scroll-view>
 			</view>
 			<slot name="right" />
@@ -116,7 +90,7 @@
 	 */
 	export default {
 		name: 'uv-tabs',
-		emits: ['click','change'],
+		emits: ['click', 'change'],
 		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
@@ -134,7 +108,7 @@
 		watch: {
 			current: {
 				immediate: true,
-				handler (newValue, oldValue) {
+				handler(newValue, oldValue) {
 					// 内外部值不相等时，才尝试移动滑块
 					if (newValue !== this.innerCurrent) {
 						this.innerCurrent = newValue
@@ -183,7 +157,7 @@
 				let lineOffsetLeft = this.list
 					.slice(0, this.innerCurrent)
 					.reduce((total, curr) => total + curr.rect.width, 0);
-        // 获取下划线的数值px表示法
+				// 获取下划线的数值px表示法
 				let lineWidth = this.$uv.getPx(this.lineWidth);
 				// 如果传的值未带单位+设置了全局单位，则带上单位计算，这样才没有误差
 				if (this.$uv.test.number(this.lineWidth) && this.$uv.unit) {
@@ -224,7 +198,7 @@
 				})
 				// 如果disabled状态，返回
 				if (item.disabled) return
-				if(this.innerCurrent != index) {
+				if (this.innerCurrent != index) {
 					this.$emit('change', {
 						...item,
 						index
@@ -232,14 +206,14 @@
 				}
 				this.innerCurrent = index
 				// #ifndef APP-NVUE
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					this.resize()
 				})
 				// #endif
 				// #ifdef APP-NVUE
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					// nvue模式下再给点延时，确保万无一失
-					this.$uv.sleep(30).then(res=>{
+					this.$uv.sleep(30).then(res => {
 						this.resize()
 					});
 				})
@@ -271,7 +245,7 @@
 			// 获取所有标签的尺寸
 			resize() {
 				// 如果不存在list，则不处理
-				if(this.list.length === 0) {
+				if (this.list.length === 0) {
 					return
 				}
 				Promise.all([this.getTabsRect(), this.getAllItemRect()]).then(([tabsRect, itemRect = []]) => {
@@ -330,6 +304,7 @@
 <style lang="scss" scoped>
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+
 	.uv-tabs {
 
 		&__wrapper {
@@ -387,4 +362,4 @@
 			}
 		}
 	}
-</style>
+</style>

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -33,7 +33,8 @@
         "cart/cart",
         "checkout/checkout",
         "addressList/addressList",
-        "addressAdd/addressAdd"
+        "addressAdd/addressAdd",
+        "orderList/orderList"
       ]
     },
     {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -130,13 +130,13 @@ var components
 try {
   components = {
     uvEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 330))
+      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 341))
     },
     uvButton: function () {
-      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 338))
+      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 349))
     },
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 346))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 357))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,22 +101,22 @@ var components
 try {
   components = {
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 346))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 357))
     },
     uvButton: function () {
-      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 338))
+      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 349))
     },
     uvCode: function () {
-      return Promise.all(/*! import() | uni_modules/uv-code/components/uv-code/uv-code */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-code/components/uv-code/uv-code")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-code/components/uv-code/uv-code.vue */ 401))
+      return Promise.all(/*! import() | uni_modules/uv-code/components/uv-code/uv-code */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-code/components/uv-code/uv-code")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-code/components/uv-code/uv-code.vue */ 412))
     },
     uvCheckboxGroup: function () {
-      return Promise.all(/*! import() | uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.vue */ 407))
+      return Promise.all(/*! import() | uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.vue */ 418))
     },
     uvCheckbox: function () {
-      return Promise.all(/*! import() | uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue */ 415))
+      return Promise.all(/*! import() | uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue */ 426))
     },
     uvText: function () {
-      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 319))
+      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 330))
     },
   }
 } catch (e) {
@@ -282,7 +282,7 @@ var _validate = __webpack_require__(/*! @/uitls/validate */ 134);
 //
 var imageCode = function imageCode() {
   __webpack_require__.e(/*! require.ensure | components/login/imageCode */ "components/login/imageCode").then((function () {
-    return resolve(__webpack_require__(/*! @/components/login/imageCode.vue */ 423));
+    return resolve(__webpack_require__(/*! @/components/login/imageCode.vue */ 434));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/message/message.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uvEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 330))
+      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 341))
     },
     uvButton: function () {
-      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 338))
+      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 349))
     },
     uvBadge: function () {
-      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 394))
+      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 405))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 346))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 357))
     },
     uvBadge: function () {
-      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 394))
+      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 405))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/shop/shop.js

@@ -101,22 +101,28 @@ var components
 try {
   components = {
     uvSticky: function () {
-      return Promise.all(/*! import() | uni_modules/uv-sticky/components/uv-sticky/uv-sticky */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-sticky/components/uv-sticky/uv-sticky")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-sticky/components/uv-sticky/uv-sticky.vue */ 355))
+      return Promise.all(/*! import() | uni_modules/uv-sticky/components/uv-sticky/uv-sticky */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-sticky/components/uv-sticky/uv-sticky")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-sticky/components/uv-sticky/uv-sticky.vue */ 366))
     },
     uvTabs: function () {
-      return Promise.all(/*! import() | uni_modules/uv-tabs/components/uv-tabs/uv-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-tabs/components/uv-tabs/uv-tabs")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-tabs/components/uv-tabs/uv-tabs.vue */ 363))
+      return Promise.all(/*! import() | uni_modules/uv-tabs/components/uv-tabs/uv-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-tabs/components/uv-tabs/uv-tabs")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-tabs/components/uv-tabs/uv-tabs.vue */ 374))
     },
     uvSwiper: function () {
-      return Promise.all(/*! import() | uni_modules/uv-swiper/components/uv-swiper/uv-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-swiper/components/uv-swiper/uv-swiper")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-swiper/components/uv-swiper/uv-swiper.vue */ 372))
+      return Promise.all(/*! import() | uni_modules/uv-swiper/components/uv-swiper/uv-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-swiper/components/uv-swiper/uv-swiper")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-swiper/components/uv-swiper/uv-swiper.vue */ 383))
     },
     uvList: function () {
-      return Promise.all(/*! import() | uni_modules/uv-list/components/uv-list/uv-list */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-list/components/uv-list/uv-list")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-list/components/uv-list/uv-list.vue */ 380))
+      return Promise.all(/*! import() | uni_modules/uv-list/components/uv-list/uv-list */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-list/components/uv-list/uv-list")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-list/components/uv-list/uv-list.vue */ 391))
     },
     uvListItem: function () {
-      return Promise.all(/*! import() | uni_modules/uv-list/components/uv-list-item/uv-list-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-list/components/uv-list-item/uv-list-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue */ 387))
+      return Promise.all(/*! import() | uni_modules/uv-list/components/uv-list-item/uv-list-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-list/components/uv-list-item/uv-list-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue */ 398))
     },
     uvImage: function () {
-      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 311))
+      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 322))
+    },
+    uvBadge: function () {
+      return Promise.all(/*! import() | uni_modules/uv-badge/components/uv-badge/uv-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-badge/components/uv-badge/uv-badge")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-badge/components/uv-badge/uv-badge.vue */ 405))
+    },
+    uvIcon: function () {
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 357))
     },
   }
 } catch (e) {
@@ -140,27 +146,37 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var l0 = _vm.__map(_vm.hotList, function (item, index) {
-    var $orig = _vm.__get_orig(item)
-    var m0 = _vm.formatPrice(item.price)
-    return {
-      $orig: $orig,
-      m0: m0,
-    }
-  })
-  var l1 = _vm.__map(_vm.newList, function (item, index) {
-    var $orig = _vm.__get_orig(item)
-    var m1 = _vm.formatPrice(item.price)
-    return {
-      $orig: $orig,
-      m1: m1,
-    }
-  })
+  var g0 = _vm.hotList.length
+  var l0 =
+    g0 > 0
+      ? _vm.__map(_vm.hotList, function (item, index) {
+          var $orig = _vm.__get_orig(item)
+          var m0 = _vm.formatPrice(item.price)
+          return {
+            $orig: $orig,
+            m0: m0,
+          }
+        })
+      : null
+  var g1 = _vm.newList.length
+  var l1 =
+    g1 > 0
+      ? _vm.__map(_vm.newList, function (item, index) {
+          var $orig = _vm.__get_orig(item)
+          var m1 = _vm.formatPrice(item.price)
+          return {
+            $orig: $orig,
+            m1: m1,
+          }
+        })
+      : null
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
+        g0: g0,
         l0: l0,
+        g1: g1,
         l1: l1,
       },
     }
@@ -198,7 +214,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -258,16 +274,27 @@ var _shop = __webpack_require__(/*! @/request/api/shop.js */ 115);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
       navList: [],
       newList: [],
       hotList: [],
-      topicList: []
+      topicList: [],
+      cartCount: 0
     };
   },
-  onLoad: function onLoad() {
+  onShow: function onShow() {
     this.init();
   },
   methods: {
@@ -279,9 +306,10 @@ var _default = {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
+                if (uni.getStorageSync('shopMobileToken')) _this.getCartCount();
+                _context.next = 3;
                 return (0, _shop.getCategoryList)();
-              case 2:
+              case 3:
                 navData = _context.sent;
                 if (navData.state) {
                   navList = navData.data;
@@ -293,7 +321,7 @@ var _default = {
                 }
                 _this.queryGoods();
                 _this.queryTopic();
-              case 6:
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -301,62 +329,83 @@ var _default = {
         }, _callee);
       }))();
     },
-    changeNav: function changeNav(index) {},
-    queryGoods: function queryGoods() {
+    getCartCount: function getCartCount() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var hotData, newData;
+        var countData;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.next = 2;
+                return (0, _shop.getCartCount)();
+              case 2:
+                countData = _context2.sent;
+                if (countData.state) _this2.cartCount = countData.data;
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }))();
+    },
+    changeNav: function changeNav(index) {},
+    queryGoods: function queryGoods() {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        var hotData, newData;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
                 return (0, _shop.getSearchHot)();
               case 2:
-                hotData = _context2.sent;
-                if (hotData.state) _this2.hotList = hotData.data.map(function (node) {
-                  node['img'] = _this2.shopImage(node.pic);
+                hotData = _context3.sent;
+                if (hotData.state) _this3.hotList = hotData.data.map(function (node) {
+                  node['img'] = _this3.shopImage(node.pic);
                   return node;
                 });
-                _context2.next = 6;
+                _context3.next = 6;
                 return (0, _shop.getSearchNew)();
               case 6:
-                newData = _context2.sent;
-                if (newData.state) _this2.newList = newData.data.map(function (node) {
-                  node['img'] = _this2.shopImage(node.pic);
+                newData = _context3.sent;
+                if (newData.state) _this3.newList = newData.data.map(function (node) {
+                  node['img'] = _this3.shopImage(node.pic);
                   return node;
                 });
               case 8:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2);
+        }, _callee3);
       }))();
     },
     queryTopic: function queryTopic() {
-      var _this3 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      var _this4 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
         var baseApi, topicData;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                baseApi = _this3.baseApi;
-                _context3.next = 3;
+                baseApi = _this4.baseApi;
+                _context4.next = 3;
                 return (0, _shop.getTopicList)();
               case 3:
-                topicData = _context3.sent;
-                if (topicData.state) _this3.topicList = topicData.data.map(function (node) {
-                  node['image'] = _this3.shopImage(node.article.img);
+                topicData = _context4.sent;
+                if (topicData.state) _this4.topicList = topicData.data.map(function (node) {
+                  node['image'] = _this4.shopImage(node.article.img);
                   return node;
                 });
               case 5:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       }))();
     },
     toTopic: function toTopic(id) {
@@ -373,6 +422,7 @@ var _default = {
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/shop/shop.json

@@ -6,6 +6,8 @@
     "uv-swiper": "/uni_modules/uv-swiper/components/uv-swiper/uv-swiper",
     "uv-list": "/uni_modules/uv-list/components/uv-list/uv-list",
     "uv-list-item": "/uni_modules/uv-list/components/uv-list-item/uv-list-item",
-    "uv-image": "/uni_modules/uv-image/components/uv-image/uv-image"
+    "uv-image": "/uni_modules/uv-image/components/uv-image/uv-image",
+    "uv-badge": "/uni_modules/uv-badge/components/uv-badge/uv-badge",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
   }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/shop/shop.wxss

@@ -4,6 +4,23 @@
 .shop-index .tabs.data-v-71bf3ec6 {
   background: #fff;
 }
+.shop-cart.data-v-71bf3ec6 {
+  position: fixed;
+  bottom: 80rpx;
+  right: 30rpx;
+  width: 100rpx;
+  height: 100rpx;
+}
+.shop-cart .cartbox.data-v-71bf3ec6 {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0px 2px 10px rgba(3, 3, 3, 0.1);
+  background-color: #ffffff;
+}
 .gl-body.data-v-71bf3ec6 {
   background: #fff;
 }
@@ -11,6 +28,7 @@
   padding: 20rpx;
 }
 .gl-item.data-v-71bf3ec6 {
+  width: 100%;
   display: flex;
   align-items: center;
 }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/workark/workark.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvImage: function () {
-      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 311))
+      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 322))
     },
     uvText: function () {
-      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 319))
+      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 330))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/chatPage/chat/chat.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvSafeBottom: function () {
-      return Promise.all(/*! import() | uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.vue */ 459))
+      return Promise.all(/*! import() | uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.vue */ 470))
     },
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 346))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 357))
     },
   }
 } catch (e) {