fix

virgo.wzfrontend/workark_wx/App.vue

@@ -3,11 +3,18 @@
 		onLaunch: function() {
 			console.log('App Launch')
 		},
-		onShow: function() {
-			console.log('App Show')
+		// 在页面的onShow生命周期中
+		onShow() {
+			// 尝试从本地存储中恢复数据
+			const savedState = uni.getStorageSync('vuex_state');
+			if (savedState) this.$store.replaceState(Object.assign({}, this.$store.state, savedState));
+			if (this.$store.getters.user.userId) this.$chat.connect(this.$store.getters.user.userId);
 		},
-		onHide: function() {
-			console.log('App Hide')
+		// 在页面的onHide生命周期中
+		onHide() {
+			// 保存状态到本地存储
+			uni.setStorageSync('vuex_state', this.$store.state);
+			uni.removeStorageSync('chatToken');
 		}
 	}
 </script>

virgo.wzfrontend/workark_wx/main.js

@@ -1,7 +1,15 @@
 import App from './App'
 import Vue from 'vue'
 import store from './store'
-
+import uvUI from '@/uni_modules/uv-ui-tools'
+Vue.use(uvUI);
+uni.$uv.setConfig({
+	// 修改$uv.config对象的属性
+	config: {
+		// 修改默认单位为rpx，相当于执行 uni.$uv.config.unit = 'rpx'
+		unit: 'rpx'
+	}
+})
 Vue.prototype.$store = store;
 Vue.prototype.$toast = msg => {
 	uni.showToast({
@@ -17,8 +25,6 @@ Vue.prototype.$navigateTo = (url) => {
 		url: url
 	})
 }
-
-
 Vue.config.productionTip = false;
 App.mpType = 'app'
 const app = new Vue({

virgo.wzfrontend/workark_wx/pages.json

@@ -37,6 +37,16 @@
 			"style": {
 				"navigationBarTitleText": "服务详情"
 			}
+		}, {
+			"path": "surOrder/surOrder",
+			"style": {
+				"navigationBarTitleText": "确认订单"
+			}
+		}, {
+			"path": "coupon/coupon",
+			"style": {
+				"navigationBarTitleText": "优惠券"
+			}
 		}]
 	}],
 	"tabBar": {

virgo.wzfrontend/workark_wx/pages/login/login.vue

@@ -50,8 +50,8 @@
 		</view>
 		<view class="pact">
 			<uv-checkbox-group v-model="pactChecked" shape="circle" placement="column" customStyle="maxWidth:208rpx;"
-				labelSize="24rpx">
-				<uv-checkbox :name="true" label="我已阅读并同意" iconColor="#ffffff"></uv-checkbox>
+				labelSize="24">
+				<uv-checkbox :name="true" label="我已阅读并同意" iconColor="#ffffff" size="32" iconSize="28"></uv-checkbox>
 			</uv-checkbox-group>
 			<uv-text text="《用户协议》" size="24rpx" type="primary" @click="toPact"></uv-text>
 			<uv-text text="和" size="24rpx"></uv-text>
@@ -285,11 +285,6 @@
 		padding-bottom: 120rpx;
 		font-size: 24rpx;
 		height: 40rpx;
-
-		::v-deep .uv-text {
-			width: auto;
-			flex: inherit;
-		}
 	}
 
 	.title {

virgo.wzfrontend/workark_wx/pages/workark/workark.vue

@@ -3,18 +3,21 @@
 		<view class="workark-item" v-for="(item,index) in list" :key="item.id">
 			<view class="workark-item-title">{{item.name}}</view>
 			<view class="workark-content">
-				<view class="workark-content-item" v-for="(serve,i) in item.children" :key="serve.id"
-					@tap="$navigateTo('/subPages/workarkPage/workarkDetail/workarkDetail?productLevelId=' + serve.id)">
+				<view class="workark-content-item" v-for="(serve,i) in item.children" :key="serve.id">
 					<view class="workark-content-box">
-						<view class="product-item" @click="clickItem">
+						<view class="product-item"
+							@tap="$navigateTo('/subPages/workarkPage/workarkDetail/workarkDetail?productLevelId=' + serve.id)">
 							<view class="product-item-image">
 								<uv-image :src="imageUrl(serve.showPictures)" mode="scaleToFill" width="100%"
 									height="100%">
 								</uv-image>
 							</view>
 							<view class="product-content">
-								<view class="product-item-title">{{serve.name}}</view>
-								<uv-text :lines="2" :text="serve.remark" type="tips" size="13"></uv-text>
+								<uv-text :lines="2" :text="serve.name" size="32" :customStyle="{
+									fontWeight: 600,
+									marginBottom: '10rpx'
+								}"></uv-text>
+								<uv-text :lines="2" :text="serve.remark" type="tips" size="26"></uv-text>
 							</view>
 						</view>
 					</view>
@@ -40,9 +43,6 @@
 			async init() {
 				let productData = await getServeProductList(-1);
 				if (productData.state) this.list = productData.data;
-			},
-			clickItem() {
-
 			},
 			imageUrl(data) {
 				if (!data) return 'https://assets.api.uizard.io/api/cdn/stream/c05650d2-192b-4a56-ae97-05638f53804c.png';
@@ -108,10 +108,4 @@
 	.product-content {
 		padding: 20rpx;
 	}
-
-	.product-item-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		margin-bottom: 10rpx;
-	}
 </style>

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

@@ -34,4 +34,38 @@ export function getCustomerServeDetail(id) {
 		url: `/manager/customer/${id}`,
 		method: 'get'
 	})
+}
+/* 
+ * 通过id获取服务详情
+ * 
+ * 
+ */
+export function getServeById(id) {
+	return request({
+		url: `/api/workarkProduct/details/${id}`,
+		method: 'get',
+	})
+}
+/* 
+ * 计算价格
+ * 
+ * 
+ */
+export function countPriceAPI(productId, productCouponIds) {
+	return request({
+		url: `/api/workarkOrderInfo/calculatePrice/${productId}/${productCouponIds}`,
+		method: 'get'
+	})
+}
+/* 
+ * 通过条件获取优惠券列表
+ * 
+ * 
+ */
+export function getCouponListByQuery(data) {
+	return request({
+		url: `/api/workarkProductCoupon/query`,
+		method: 'post',
+		data: data
+	})
 }

virgo.wzfrontend/workark_wx/static/scss/common.scss

@@ -13,5 +13,12 @@
 	padding-bottom: 0;
 	padding-bottom: constant(safe-area-inset-bottom);  
 	padding-bottom: env(safe-area-inset-bottom);
-	padding-right: 40rpx;
+	padding-right: 40rpx;
+	padding-left: 40rpx;
+}
+
+.text-flex {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 }

virgo.wzfrontend/workark_wx/subPages/workarkPage/coupon/coupon.vue

@@ -0,0 +1,160 @@
+<template>
+	<view class="coupon-list">
+		<uv-empty mode="coupon" textSize="28" iconSize="180" v-if="coupon.length === 0"></uv-empty>
+		<view v-else>
+			<view :class="returnCouponClass(item) ?'coupon-card' : 'coupon-card disabled'"
+				v-for="(item,index) in coupon" :key="index" @tap="checkCoupon(item)">
+				<view
+					:class="couponChecked.findIndex(node=>node.id === item.id) > -1 ? 'coupon-card-box active' :'coupon-card-box'">
+					<view class="price">
+						<view v-if="item.type === 1">
+							<text class="symbol">¥</text>
+							<text>{{item.couponAmount}}</text>
+						</view>
+						<view v-else>
+							<text>{{item.discount*100}}</text>
+							<text class="symbol">折</text>
+						</view>
+					</view>
+					<view class="center-describe">
+						<uv-text :text="item.title" :lines="1" size="30"></uv-text>
+						<uv-text
+							:text="item.type === 1?`满${item.threshold}减${item.couponAmount}`:`满${item.threshold}可用，最高抵扣${item.mostConstraint}`"
+							type="content" :lines="1" size="26">
+						</uv-text>
+					</view>
+					<view class="icon-check">
+						<uv-icon name="checkmark" color="#fff" size="28"></uv-icon>
+					</view>
+				</view>
+			</view>
+			<view class="hui-button-box">
+				<uv-button type="primary" :text="`使用优惠券${couponChecked.length}张`" @tap="changeCoupon"></uv-button>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import {
+		getCouponListByQuery
+	} from '@/request/api/workark.js'
+	export default {
+		data() {
+			return {
+				productLevelId: '',
+				coupon: [],
+				couponChecked: [],
+				isStacking: false,
+				price: 0
+			}
+		},
+		onLoad(body) {
+			this.productLevelId = body.productLevelId;
+			this.price = body.price || 0;
+			if (this.productLevelId) this.init()
+		},
+		methods: {
+			async init() {
+				let couponData = await getCouponListByQuery({
+					userId: this.$store.getters.user.userId,
+					productLevelId: this.productLevelId,
+					state: 1
+				})
+				if (!couponData.state) return;
+				this.coupon = couponData.data;
+			},
+			returnCouponClass(item) {
+				if (item.threshold > this.price) return false; //大于满减。
+				if (this.couponChecked.findIndex(node => node.id === item.id) > -1) return true; //已选择的返回true
+				if (this.couponChecked.length === 0) return true; //未选择优惠券时都能选择。
+				if (this.isStacking && item.overlayUse === 0) return false; //叠加时不能选择不能叠加优惠券。
+				if (this.isStacking && item.overlayUse === 1) return true; //叠加时能选择叠加优惠券。
+			},
+			checkCoupon(item) {
+				if (!this.returnCouponClass(item)) return;
+				let index = this.couponChecked.findIndex(node => node.id === item.id);
+				if (index === -1) {
+					this.couponChecked.push(item);
+				} else {
+					this.couponChecked.splice(index, 1);
+				}
+				this.isStacking = this.couponChecked.length > 0 ? this.couponChecked[0].overlayUse === 1 : false; //是否可叠加
+			},
+			changeCoupon() {
+				uni.$emit('changeCoupon', this.couponChecked);
+				uni.navigateBack();
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.coupon-list {
+		padding: 30rpx;
+	}
+
+	.coupon-card {
+		margin-bottom: 20rpx;
+
+		&.disabled {
+			.coupon-card-box {
+				opacity: 0.6;
+				cursor: unset;
+
+				&.active {
+					border-color: $uv-border-color;
+				}
+			}
+		}
+
+		.coupon-card-box {
+			background: #fff;
+			padding: 30rpx 0;
+			align-items: center;
+			display: flex;
+			position: relative;
+			border: 2rpx solid $uv-border-color;
+			overflow: hidden;
+
+			&.active {
+				border-color: $uv-primary;
+
+				.icon-check {
+					background: $uv-primary;
+					border-color: $uv-primary;
+				}
+			}
+		}
+
+		.price {
+			color: $uv-error;
+			font-size: 48rpx;
+			font-weight: 500;
+			line-height: 48rpx;
+			text-align: center;
+			width: 200rpx;
+
+			.symbol {
+				margin: 0 6rpx;
+				font-size: 26rpx;
+			}
+		}
+
+		.center-describe {
+			display: inline-block;
+			margin-right: auto;
+			text-align: left;
+		}
+
+		.icon-check {
+			border: 1px solid $uv-border-color;
+			width: 40rpx;
+			height: 40rpx;
+			border-radius: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-right: 30rpx;
+		}
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/workarkPage/surOrder/surOrder.vue

@@ -0,0 +1,178 @@
+<template>
+	<view class="sure-order">
+		<view class="order-detail">
+			<view class="order-title">
+				<uv-text text="订单详情" :customStyle="{
+					fontWeight:'bold'
+				}" size="32"></uv-text>
+			</view>
+			<view class="order-content">
+				<uv-image :src="imageUrl(orderData.rotatingImages) || ''" width="180" height="180" radius="16">
+				</uv-image>
+				<view class="order-content-detail">
+					<uv-text :text="orderData.name" :lines="2" size="28"></uv-text>
+					<uv-text text="x1" type="content" size="28" :customStyle="{
+						background:'#eee',
+						padding:'2rpx 16rpx',
+						borderRadius:'4rpx',
+						margin:'10rpx 0'
+					}"></uv-text>
+					<uv-text :text="orderData.price" type="error" size="32" mode="price"></uv-text>
+				</view>
+			</view>
+			<view class="order-item">
+				<uv-text text="优惠券" size="28"></uv-text>
+				<view class="text-flex"
+					@tap="$navigateTo('/subPages/workarkPage/coupon/coupon?productLevelId=' + orderData.productLevelId + '&price=' + orderData.price)">
+					<text class="order-item-icon">-</text>
+					<uv-text :text="minus" type="error" size="28" mode="price"></uv-text>
+					<uv-icon name="arrow-right" size="32"></uv-icon>
+				</view>
+			</view>
+			<view class="order-count">
+				<view class="text-flex">
+					<uv-text text="合计：" size="28"></uv-text>
+					<uv-text :text="countPriceData.totalFee" type="error" size="28" mode="price"></uv-text>
+				</view>
+			</view>
+		</view>
+		<view class="hui-button-box">
+			<view class="button-flex">
+				<uv-text :text="countPriceData.totalFee" type="error" size="28" mode="price"></uv-text>
+				<view class="text-flex">
+					<uv-text text="-" type="error" size="24"></uv-text>
+					<uv-text :text="minus" type="error" size="24" mode="price"></uv-text>
+				</view>
+			</view>
+			<uv-button type="primary" text="立即支付" @tap="payment" :disabled="isCount"></uv-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getServeById,
+		countPriceAPI
+	} from '@/request/api/workark.js'
+	export default {
+		data() {
+			return {
+				orderId: '',
+				orderData: {
+					price: 0
+				},
+				countPriceData: {
+					productCoupon: [],
+					totalFee: 0
+				},
+				isCount: false,
+				couponChecked: []
+			};
+		},
+		onLoad(body) {
+			this.orderId = body.orderId;
+			uni.$on('changeCoupon', this.changeCoupon);
+			if (this.orderId) this.init();
+		},
+		computed: {
+			minus() {
+				let data = this.countPriceData.productCoupon || [];
+				let num = 0;
+				for (var i = 0; i < data.length; i++) {
+					num += data[i].minus
+				}
+				return num;
+			}
+		},
+		methods: {
+			async init() {
+				let orderData = await getServeById(this.orderId);
+				if (!orderData.state) return;
+				this.orderData = orderData.data;
+				this.countPrice();
+			},
+			imageUrl(data) {
+				if (!data) return '';
+				let imgData = JSON.parse(data)[0];
+				if (!imgData) return '';
+				return imgData.url;
+			},
+			async countPrice() {
+				this.isCount = true;
+				let couponIds = this.couponChecked.map(node => node.id).join(',') || -1;
+				let countPriceData = await countPriceAPI(this.orderData.id, couponIds);
+				this.isCount = false;
+				if (!countPriceData.state) return;
+				this.countPriceData = countPriceData.data;
+			},
+			changeCoupon(data) {
+				this.couponChecked = data;
+				this.countPrice();
+			},
+			payment() {
+				uni.requestPayment({
+					provider: 'wxpay',
+					timeStamp: String(Date.now()),
+					nonceStr: 'BOSSHAND',
+					package: 'prepay_id=wx3c006d364161d240',
+					signType: 'MD5',
+					paySign: '',
+					success: function(res) {
+						console.log('success:' + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log('fail:' + JSON.stringify(err));
+					}
+				});
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.sure-order {
+		padding: 30rpx;
+	}
+
+	.order-detail {
+		background: #fff;
+		padding: 30rpx;
+		border-radius: 16rpx;
+	}
+
+	.order-title {
+		padding-bottom: 30rpx;
+	}
+
+	.order-content {
+		display: flex;
+	}
+
+	.order-content-detail {
+		flex: 1;
+		width: 0;
+		margin-left: 30rpx;
+	}
+
+	.order-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 88rpx;
+		border-bottom: 1px solid $uv-border-color;
+		margin-bottom: 30rpx;
+	}
+
+	.order-item-icon {
+		color: $uv-error;
+	}
+
+	.order-count {
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.button-flex {
+		margin-right: 20rpx;
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/workarkPage/workarkDetail/workarkDetail.vue

@@ -4,23 +4,23 @@
 		<view class="workark-title">
 			<view class="workark-price">
 				<text class="price-unit">¥</text>
-				<uv-text type="error" :text="detail.price" size="60rpx" :customStyle="{
+				<uv-text type="error" :text="detail.price" size="60" :customStyle="{
 					fontWeight:'bold'
 				}"></uv-text>
 			</view>
-			<uv-text :text="detail.name" size="40rpx" :customStyle="{
+			<uv-text :text="detail.name" size="40" :customStyle="{
 				fontWeight:'bold',
 				marginBottom:'10rpx'
 			}" :lines="2">
 			</uv-text>
-			<uv-text :lines="2" :text="detail.subtitle" type="tips" size="13"></uv-text>
+			<uv-text :lines="2" :text="detail.subtitle" type="tips" size="26"></uv-text>
 			<view class="workark-specifications">
-				<uv-text text="规格" type="tips"></uv-text>
+				<uv-text text="规格" type="tips" size="28"></uv-text>
 				<view class="specifications-list">
 					<view class="coupon-card" v-for="(item,index) in productList" :key="index"
-						@click="initDetail(index)">
+						@tap="initDetail(index)">
 						<view class="coupon-card-box" :class="{active:detail.id === item.id}">
-							<uv-text :text="item.name" :type="detail.id === item.id?'primary':''"></uv-text>
+							<uv-text :text="item.name" :type="detail.id === item.id?'primary':''" size="28"></uv-text>
 							<view class="icon-check">
 								<uv-icon name="checkmark" color="#fff" size="24rpx"></uv-icon>
 							</view>
@@ -29,7 +29,7 @@
 				</view>
 			</view>
 		</view>
-		<uv-divider text="产品详情" :hairline="true"></uv-divider>
+		<uv-divider text="产品详情" :hairline="true" textSize="28"></uv-divider>
 		<view class="workark-detail-list">
 			<view class="home-detail-img" v-for="(item,index) in detailedImage" :key="item.id">
 				<uv-image :src="item.url" width="100%" mode="widthFix"></uv-image>
@@ -37,9 +37,12 @@
 		</view>
 		<view class="hui-button-box">
 			<view class="icon-kefu">
-				<uv-icon name="kefu-ermai" color="primary" size="50rpx" label="客服" labelPos="bottom" labelSize="20rpx"></uv-icon>
+				<uv-icon name="kefu-ermai" color="primary" size="50" label="客服" labelPos="bottom" labelSize="20">
+				</uv-icon>
 			</view>
-			<uv-button type="primary" text="立即购买"></uv-button>
+			<uv-button type="primary" text="立即购买"
+				@tap="$navigateTo('/subPages/workarkPage/surOrder/surOrder?orderId=' + detail.id)">
+			</uv-button>
 		</view>
 	</view>
 </template>

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

@@ -170,10 +170,6 @@
 		@include flex(row);
 		align-items: center;
 		flex-wrap: nowrap;
-		flex: 1;
-		/* #ifndef APP-NVUE */
-		width: 100%;
-		/* #endif */
 		&__price {
 			font-size: 14px;
 			color: $uv-content-color;

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

@@ -11,7 +11,9 @@
     {
       "root": "subPages/workarkPage",
       "pages": [
-        "workarkDetail/workarkDetail"
+        "workarkDetail/workarkDetail",
+        "surOrder/surOrder",
+        "coupon/coupon"
       ]
     }
   ],

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -15,6 +15,12 @@
   padding-bottom: constant(safe-area-inset-bottom);
   padding-bottom: env(safe-area-inset-bottom);
   padding-right: 40rpx;
+  padding-left: 40rpx;
+}
+.text-flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 page {
   background-color: #f3f4f6;

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

@@ -92,10 +92,6 @@
   font-size: 24rpx;
   height: 40rpx;
 }
-.pact.data-v-b237504c  .uv-text {
-  width: auto;
-  flex: inherit;
-}
 .title.data-v-b237504c {
   padding-top: 180rpx;
   padding-bottom: 40rpx;

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

@@ -38,8 +38,3 @@
 .product-content.data-v-2875234c {
   padding: 20rpx;
 }
-.product-item-title.data-v-2875234c {
-  font-size: 32rpx;
-  font-weight: 600;
-  margin-bottom: 10rpx;
-}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/static/scss/common.scss

@@ -13,5 +13,12 @@
 	padding-bottom: 0;
 	padding-bottom: constant(safe-area-inset-bottom);  
 	padding-bottom: env(safe-area-inset-bottom);
-	padding-right: 40rpx;
+	padding-right: 40rpx;
+	padding-left: 40rpx;
+}
+
+.text-flex {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/workarkPage/coupon/coupon.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "优惠券",
+  "usingComponents": {
+    "uv-empty": "/uni_modules/uv-empty/components/uv-empty/uv-empty",
+    "uv-text": "/uni_modules/uv-text/components/uv-text/uv-text",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
+    "uv-button": "/uni_modules/uv-button/components/uv-button/uv-button"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/workarkPage/coupon/coupon.wxss

@@ -0,0 +1,56 @@
+.coupon-list.data-v-6d2abadb {
+  padding: 30rpx;
+}
+.coupon-card.data-v-6d2abadb {
+  margin-bottom: 20rpx;
+}
+.coupon-card.disabled .coupon-card-box.data-v-6d2abadb {
+  opacity: 0.6;
+  cursor: unset;
+}
+.coupon-card.disabled .coupon-card-box.active.data-v-6d2abadb {
+  border-color: #dadbde;
+}
+.coupon-card .coupon-card-box.data-v-6d2abadb {
+  background: #fff;
+  padding: 30rpx 0;
+  align-items: center;
+  display: flex;
+  position: relative;
+  border: 2rpx solid #dadbde;
+  overflow: hidden;
+}
+.coupon-card .coupon-card-box.active.data-v-6d2abadb {
+  border-color: #3c9cff;
+}
+.coupon-card .coupon-card-box.active .icon-check.data-v-6d2abadb {
+  background: #3c9cff;
+  border-color: #3c9cff;
+}
+.coupon-card .price.data-v-6d2abadb {
+  color: #f56c6c;
+  font-size: 48rpx;
+  font-weight: 500;
+  line-height: 48rpx;
+  text-align: center;
+  width: 200rpx;
+}
+.coupon-card .price .symbol.data-v-6d2abadb {
+  margin: 0 6rpx;
+  font-size: 26rpx;
+}
+.coupon-card .center-describe.data-v-6d2abadb {
+  display: inline-block;
+  margin-right: auto;
+  text-align: left;
+}
+.coupon-card .icon-check.data-v-6d2abadb {
+  border: 1px solid #dadbde;
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-right: 30rpx;
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/workarkPage/surOrder/surOrder.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "确认订单",
+  "usingComponents": {
+    "uv-text": "/uni_modules/uv-text/components/uv-text/uv-text",
+    "uv-image": "/uni_modules/uv-image/components/uv-image/uv-image",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
+    "uv-button": "/uni_modules/uv-button/components/uv-button/uv-button"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/workarkPage/surOrder/surOrder.wxss

@@ -0,0 +1,37 @@
+.sure-order {
+  padding: 30rpx;
+}
+.order-detail {
+  background: #fff;
+  padding: 30rpx;
+  border-radius: 16rpx;
+}
+.order-title {
+  padding-bottom: 30rpx;
+}
+.order-content {
+  display: flex;
+}
+.order-content-detail {
+  flex: 1;
+  width: 0;
+  margin-left: 30rpx;
+}
+.order-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 88rpx;
+  border-bottom: 1px solid #dadbde;
+  margin-bottom: 30rpx;
+}
+.order-item-icon {
+  color: #f56c6c;
+}
+.order-count {
+  display: flex;
+  justify-content: flex-end;
+}
+.button-flex {
+  margin-right: 20rpx;
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-empty/components/uv-empty/uv-empty.wxss

@@ -0,0 +1,30 @@
+view.data-v-099b9c0f, scroll-view.data-v-099b9c0f, swiper-item.data-v-099b9c0f {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.uv-empty.data-v-099b9c0f {
+  display: flex;
+  flex-direction: row;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.uv-empty__text.data-v-099b9c0f {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20rpx;
+}
+.uv-slot-wrap.data-v-099b9c0f {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20rpx;
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-radio/components/uv-radio/uv-radio.js

@@ -1 +0,0 @@
-Component({})

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-radio/components/uv-radio/uv-radio.wxss

@@ -1,75 +0,0 @@
-.uv-border-bottom.data-v-4c84423e {
-  border-bottom-width: 0.5px !important;
-  border-color: #dadbde !important;
-  border-bottom-style: solid;
-}
-view.data-v-4c84423e, scroll-view.data-v-4c84423e, swiper-item.data-v-4c84423e {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.uv-radio.data-v-4c84423e {
-  display: flex;
-  flex-direction: row;
-  overflow: hidden;
-  flex-direction: row;
-  align-items: center;
-}
-.uv-radio-label--left.data-v-4c84423e {
-  flex-direction: row;
-}
-.uv-radio-label--right.data-v-4c84423e {
-  flex-direction: row-reverse;
-  justify-content: space-between;
-}
-.uv-radio__icon-wrap.data-v-4c84423e {
-  box-sizing: border-box;
-  transition-property: border-color, background-color, color;
-  transition-duration: 0.2s;
-  color: #606266;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  color: transparent;
-  text-align: center;
-  font-size: 20px;
-  border-width: 1px;
-  border-color: #c8c9cc;
-  border-style: solid;
-}
-.uv-radio__icon-wrap--circle.data-v-4c84423e {
-  border-radius: 100%;
-}
-.uv-radio__icon-wrap--square.data-v-4c84423e {
-  border-radius: 3px;
-}
-.uv-radio__icon-wrap--checked.data-v-4c84423e {
-  color: #fff;
-  background-color: red;
-  border-color: #2979ff;
-}
-.uv-radio__icon-wrap--disabled.data-v-4c84423e {
-  background-color: #ebedf0 !important;
-}
-.uv-radio__icon-wrap--disabled--checked.data-v-4c84423e {
-  color: #c8c9cc !important;
-}
-.uv-radio__label.data-v-4c84423e {
-  word-wrap: break-word;
-  margin-left: 5px;
-  margin-right: 12px;
-  color: #606266;
-  font-size: 15px;
-}
-.uv-radio__label--disabled.data-v-4c84423e {
-  color: #c8c9cc;
-}
-.uv-radio__label-wrap.data-v-4c84423e {
-  flex: 1;
-  padding-left: 6px;
-}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-text/components/uv-text/uv-text.wxss

@@ -62,8 +62,6 @@ view.data-v-2e132765, scroll-view.data-v-2e132765, swiper-item.data-v-2e132765 {
   flex-direction: row;
   align-items: center;
   flex-wrap: nowrap;
-  flex: 1;
-  width: 100%;
 }
 .uv-text__price.data-v-2e132765 {
   font-size: 14px;