冲突

components/kj-tabbar/kj-tabbar.vue

@@ -84,7 +84,8 @@
 				success: true,
 				all: [],
 				language: 'zh-CN',
-				selegoods: []
+				selegoods: [],
+				stringcheck:[]
 			};
 		},
 		onLoad() {},
@@ -144,14 +145,15 @@
 		methods: {
 			account() {
 				console.log(this.checkboxValue1);
-				var stringcheck = this.checkboxValue1.toString()
 				console.log(this.goodsList);
 				this.selegoods = []
 				this.goodsList.map((item) => {
 					item.goods.map((items) => {
 						if (this.checkboxValue1.indexOf(items.cart.sku_item_id) > -1) {
 							// item.selegoods
+							console.log(items);
 							this.selegoods = this.selegoods.concat(items)
+							this.stringcheck = this.stringcheck.concat(items.cart.id)
 						}
 					});
 				});
@@ -159,7 +161,7 @@
 					uni.navigateTo({
 						url: "/pageA/order?selelist=" + encodeURIComponent(JSON.stringify(this
 							.selegoods)) + '&typea=' + 'shop' + '&goodsPrice=' + this.goodsPrice +
-							'&goodsWeight=' + this.goodsWeight + '&stringcheck=' + stringcheck,
+							'&goodsWeight=' + this.goodsWeight + '&stringcheck=' + this.stringcheck.toString(),
 					});
 				})
 			},

pageA/confirm.vue

@@ -26,11 +26,8 @@
 		},
 		methods: {
 			orderinfo() {
-				// uni.reLaunch({
-				// 	url: '/pageC/orderForm/orderForm?follow=' + ''
-				// })
-				uni.switchTab({
-					url:'/pages/mine/mine'
+				uni.reLaunch({
+					url: '/pageC/orderForm/orderForm'
 				})
 			},
 			toindex() {

pageA/order.vue

@@ -140,8 +140,9 @@
 				<view class="">
 					<text class="small">{{i18n.subtotal}}</text>
 					<text class="mon">¥</text>
+					<text class="mon" v-if="typea=='shop'">{{goodsPrice}}</text>
 					<text class="mon"
-						style="font-size: 40rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}</text>
+						v-else style="font-size: 40rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}</text>
 				</view>
 			</view>
 		</view>
@@ -152,7 +153,7 @@
 				<text v-else class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text>
 				<text>{{i18n.total}}:</text>
 				<text class="money" style="font-size: 28rpx;">¥</text>
-				<text style="font-weight: bold;" class="money" v-if="typea=='shop'">{{goodsPrice}}</text>
+				<text style="font-weight: bold;" class="money" v-if="typea=='shop'">{{(Number(sum*10000+ Number(goodsPrice)*10000))/10000 }}</text>
 				<view class="" v-else>
 					<text class="money" v-if="goodinfo.is_discount==1"
 						style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.price)*Number(value)*10000))/10000}}</text>
@@ -204,7 +205,7 @@
 				</view>
 				<scroll-view :scroll-y="true" style="500rpx">
 					<view class="transport" style="margin-top: 32rpx;" @click="activea(item,idx)"
-						v-for="(item,idx) in containlist" v-if="item.sum !=0">
+						v-for="(item,idx) in containlist" >
 						<view class="u-flex u-row-between">
 							<text class="yundate">{{i18n.Shipmentdate}} {{item.end_date}}</text>
 							<image v-if="datechan==idx" src="/pageA/static/images/active.png"

pageA/productdetails.vue

@@ -158,7 +158,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="goshop" @click="goshop">{{ i18n.stroll }}</view>
+					<view class="goshop" @click="goshop(goodinfo.merchant.id)">{{ i18n.stroll }}</view>
 				</view>
 				<!-- 推荐 -->
 				<view class="recommend">
@@ -410,7 +410,7 @@
 				<view class="button" @click="close" style="background: #fff; color: #555555; margin-top: 58rpx">
 					{{ i18n.Cancel }}
 				</view>
-			</view>
+			</view>  
 		</u-popup>
 
 		<u-popup :show="imagea" bgColor=" rgba(244, 244, 244, 0);" mode="center"
@@ -712,7 +712,7 @@
 					.catch(() => {});
 			},
 			scrollToPosition(e) {
-				var that = this
+				var that = this  
 				this.current = e.index;
 				console.log(this.current);
 				this.$nextTick(() => {
@@ -721,9 +721,9 @@
 				})
 			},
 			//逛逛
-			goshop() {
+			goshop(id) {
 				uni.navigateTo({
-					url: "/pageD/homepage/homepage",
+					url: "/pageD/homepage/homepage?merchant_id=" + id,
 				});
 			},
 			detail(id) {

pageC/orderForm/orderForm.vue

@@ -1,6 +1,6 @@
 <template>
   <view>
-    <u-navbar @leftClick="rightClick" bgColor="#f4f4f4" :autoBack="true">
+    <u-navbar @leftClick="rightClick" bgColor="#f4f4f4" >
       <view class="tab" slot="center">
         <view
           style="
@@ -136,6 +136,9 @@ export default {
   methods: {
     rightClick() {
       console.log(111);
+	  uni.switchTab({
+	  	url:'/pages/mine/mine'
+	  })
     },
     //切换搜索订单状态
     tabSwitch(num) {

unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js

@@ -214,7 +214,8 @@ var _default2 = (_name$props$computed$ = {
       success: true,
       all: [],
       language: 'zh-CN',
-      selegoods: []
+      selegoods: [],
+      stringcheck: []
     };
   },
   onLoad: function onLoad() {}
@@ -268,20 +269,21 @@ var _default2 = (_name$props$computed$ = {
   account: function account() {
     var _this = this;
     console.log(this.checkboxValue1);
-    var stringcheck = this.checkboxValue1.toString();
     console.log(this.goodsList);
     this.selegoods = [];
     this.goodsList.map(function (item) {
       item.goods.map(function (items) {
         if (_this.checkboxValue1.indexOf(items.cart.sku_item_id) > -1) {
           // item.selegoods
+          console.log(items);
           _this.selegoods = _this.selegoods.concat(items);
+          _this.stringcheck = _this.stringcheck.concat(items.cart.id);
         }
       });
     });
     this.$nextTick(function () {
       uni.navigateTo({
-        url: "/pageA/order?selelist=" + encodeURIComponent(JSON.stringify(_this.selegoods)) + '&typea=' + 'shop' + '&goodsPrice=' + _this.goodsPrice + '&goodsWeight=' + _this.goodsWeight + '&stringcheck=' + stringcheck
+        url: "/pageA/order?selelist=" + encodeURIComponent(JSON.stringify(_this.selegoods)) + '&typea=' + 'shop' + '&goodsPrice=' + _this.goodsPrice + '&goodsWeight=' + _this.goodsWeight + '&stringcheck=' + _this.stringcheck.toString()
       });
     });
   },

unpackage/dist/dev/mp-weixin/pageA/confirm.js

@@ -166,11 +166,8 @@ var _default = {
   },
   methods: {
     orderinfo: function orderinfo() {
-      // uni.reLaunch({
-      // 	url: '/pageC/orderForm/orderForm?follow=' + ''
-      // })
-      uni.switchTab({
-        url: '/pages/mine/mine'
+      uni.reLaunch({
+        url: '/pageC/orderForm/orderForm'
       });
     },
     toindex: function toindex() {

unpackage/dist/dev/mp-weixin/pageA/order.js

@@ -171,21 +171,34 @@ var render = function () {
   var m8 = !(_vm.goodinfo.is_discount == 1) ? Number(_vm.value * 100) : null
   var m9 = Number(_vm.sku_info.weight)
   var m10 =
-    _vm.goodinfo.is_discount == 1 ? Number(_vm.sku_info.price * 100) : null
-  var m11 = _vm.goodinfo.is_discount == 1 ? Number(_vm.value * 100) : null
-  var m12 = !(_vm.goodinfo.is_discount == 1)
-    ? Number(_vm.sku_info.discount_price * 100)
-    : null
-  var m13 = !(_vm.goodinfo.is_discount == 1) ? Number(_vm.value * 100) : null
+    !(_vm.typea == "shop") && _vm.goodinfo.is_discount == 1
+      ? Number(_vm.sku_info.price * 100)
+      : null
+  var m11 =
+    !(_vm.typea == "shop") && _vm.goodinfo.is_discount == 1
+      ? Number(_vm.value * 100)
+      : null
+  var m12 =
+    !(_vm.typea == "shop") && !(_vm.goodinfo.is_discount == 1)
+      ? Number(_vm.sku_info.discount_price * 100)
+      : null
+  var m13 =
+    !(_vm.typea == "shop") && !(_vm.goodinfo.is_discount == 1)
+      ? Number(_vm.value * 100)
+      : null
   var m14 = !(_vm.typea == "shop") ? Number(_vm.sku_info.weight) : null
   var m15 =
+    _vm.typea == "shop"
+      ? Number(_vm.sum * 10000 + Number(_vm.goodsPrice) * 10000)
+      : null
+  var m16 =
     !(_vm.typea == "shop") && _vm.goodinfo.is_discount == 1
       ? Number(
           _vm.sum * 10000 +
             Number(_vm.sku_info.price) * Number(_vm.value) * 10000
         )
       : null
-  var m16 =
+  var m17 =
     !(_vm.typea == "shop") && _vm.goodinfo.is_discount == 0
       ? Number(
           _vm.sum * 10000 +
@@ -219,6 +232,7 @@ var render = function () {
         m14: m14,
         m15: m15,
         m16: m16,
+        m17: m17,
       },
     }
   )
@@ -501,6 +515,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {

unpackage/dist/dev/mp-weixin/pageA/productdetails.js

@@ -994,9 +994,9 @@ var _default = {
       });
     },
     //逛逛
-    goshop: function goshop() {
+    goshop: function goshop(id) {
       uni.navigateTo({
-        url: "/pageD/homepage/homepage"
+        url: "/pageD/homepage/homepage?merchant_id=" + id
       });
     },
     detail: function detail(id) {

unpackage/dist/dev/mp-weixin/pageC/orderForm/orderForm.js

@@ -216,6 +216,9 @@ var _default = {
   methods: {
     rightClick: function rightClick() {
       console.log(111);
+      uni.switchTab({
+        url: '/pages/mine/mine'
+      });
     },
     //切换搜索订单状态
     tabSwitch: function tabSwitch(num) {