upgrade 8.6

pageC/cart/ConfirmOrder.vue

@@ -179,12 +179,13 @@ export default {
 			let params = {
 				pintuan_id: this.orderInfo.pintuan_id,
 			}
-			// console.log(this.involvemenGroupInfo);
+			// console.log(this.orderInfo);
+			// console.log(this.$store.state.pintuangroup_headid);
 			if(this.orderInfo.pintuangroup_id) {
 				Object.assign(params, { pintuangroup_headid: this.$store.state.pintuangroup_headid });
 				Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
 			}
-			// console.log(params);
+			console.log(params);
 			this.$u.api.withImmediate(params).then(res => {
 				this.showGroupUser = false;
 				this.showInvolvementUser = false;
@@ -200,7 +201,6 @@ export default {
 			if(!this.debounce) return;
 			this.debounce = false;
 			if(this.orderType == 2) {
-				// this.sendOrder(0);
 				this.withImmediate();
 			} else if(this.orderType == 1) {
 				this.sendOrder(0);
@@ -256,7 +256,6 @@ export default {
 			// console.log(params);
 			this.$u.api.sendOrder(params).then(res => {
 				if(res.errCode == 0) {
-					// this.withImmediate();
 					this.$u.route({
 						type: 'redirect',
 						url: '/pageC/cart/cashier',

pageC/cart/index.vue

@@ -4,7 +4,7 @@
 			<view v-for="(store, s_index) in list" :key="s_index" class="cart-item">
 				<view class="store">
 					<u-checkbox v-model="store.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="s_index" @change="storeaAloneChange"></u-checkbox>
-					<view class="name">
+					<view class="name" @click="viewStoreDetails(store.store_id)">
 						<image :src="store.store_avatar"></image>
 						<view>{{ store.store_name }}</view>
 					</view>
@@ -12,9 +12,9 @@
 				<view class="goods">
 					<u-checkbox-group @change="goodsChange($event, s_index)">
 						<view v-for="(goods, g_index) in store.goods" :key="g_index" class="goods-item">
-							<u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="g_index" ></u-checkbox>
-							<image :src="goods.goods_image"></image>
-							<view class="info">
+							<u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="g_index"></u-checkbox>
+							<image :src="goods.goods_image" @click="viewGoodsDetails(goods.goods_id)"></image>
+							<view class="info" @click="viewGoodsDetails(goods.goods_id)">
 								<view class="name u-line-2">{{ goods.goods_name }}</view>
 								<view class="cart-info">
 									<view class="price">￥{{ goods.goods_price }}</view>
@@ -204,6 +204,23 @@ export default {
 			})
 			this.list[value[1]].checked = checked;
 			this.storeChange();
+		},
+		viewStoreDetails(sid) {
+			this.$u.route({
+				url: 'pageC/merchant/index',
+				params: {
+					id: sid
+				}
+			})
+		},
+		viewGoodsDetails(gid) {
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: gid,
+					type: 1,
+				}
+			})
 		}
 	},
 	onNavigationBarButtonTap(btn) {