Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

Signed-off-by: 罗超 <alex9012@vip.qq.com>

# Conflicts:
#	plugin/api.js

pages/goods/components/goodsaction.vue

@@ -137,6 +137,7 @@ export default {
 			}
 		},
 		joinCar() {
+			console.log('操作')
 			this.u = uni.getStorageSync('mall_UserInfo');
 			if (!this.u) {
 				this.u = {
@@ -145,7 +146,10 @@ export default {
 				};
 				this.showAuth = true;
 			} else {
-				this.$emit('join-car');
+				console.log('传入父组件')
+				this.$emit('joincar');
+				
+				
 			}
 		},
 		buy() {

pages/goods/goods.vue

@@ -166,7 +166,7 @@
 			<view style="width: calc(100vw - 20px); margin-left: 10px; overflow: hidden;"><goodlist :list="recommend"></goodlist></view>
 
 			<u-skeleton v-if="loading" :loading="true" :animation="true" bgcolor="#FFF"></u-skeleton>
-			<goodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.cover_pic" :favorite="g.favorite" :good-id="id" @join-car="joinCar" @buy="buy"></goodsaction>
+			<goodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.cover_pic" :favorite="g.favorite" :good-id="id" @joincar="joinCar" @buy="buy"></goodsaction>
 			<goodsku
 				v-if="!loading && showSku"
 				border-radius="10"

pages/order-submit/order-submit.vue

@@ -45,7 +45,10 @@
 							<view v-if="y.address_disabled">
 								<u-tag size="mini" text="不在配送范围内" type="warning" />
 							</view>
-							<view  style="height: 22px;line-height: 22px;font-size: 11px;color: #FF4048;background: #fdf6ec;padding: 0 5px;margin-bottom: 5px;display: inline-block;">
+							<view  v-if="y.freeShipping_Use==true" style="height: 22px;line-height: 22px;font-size: 11px;color: #FF4048;background: #fdf6ec;padding: 0 5px;margin-bottom: 5px;display: inline-block;">
+								<text>{{y.freeShippingDescription}}</text>
+							</view>
+							<view  v-if="y.freeShipping_Use==false" style="height: 22px;line-height: 22px;font-size: 11px;color: #909399;background: #f4f4f5;padding: 0 5px;margin-bottom: 5px;display: inline-block;">
 								<text>{{y.freeShippingDescription}}</text>
 							</view>
 							
@@ -71,7 +74,7 @@
 					</view>
 				</template>
 				<template>
-					<view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;align-items: center;flex-wrap: wrap;" v-if="x.pinkageList.length>0">
+					<view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;flex-wrap: wrap;" v-if="x.pinkageList.length>0 && x.goods_list.length>1 ">
 						已满足:
 						<view  style="height: 22px;line-height: 22px;font-size: 12px;color: #FF4048;background: #fdf6ec;padding: 0 5px;margin-left: 10px;margin-bottom: 5px;" v-for="(y, yi) in x.pinkageList" :key="yi">
 							<text>{{y.Name}}</text>

plugin/api.js

@@ -4,7 +4,7 @@ export default {
         // Vue.prototype.host2 = "http://192.168.0.110:8200"
          Vue.prototype.host2 = "https://mallApi.oytour.com"	
 		 // Vue.prototype.host2 = "http://192.168.2.16:8088"	
-            //Vue.prototype.host2 = "http://192.168.2.65"
+		 		// Vue.prototype.host2 = "http://192.168.2.65"
 				Vue.prototype.request = function(param, success, failed) {
 				    //网络请求
 				    uni.request({
@@ -48,27 +48,28 @@ export default {
                 },
                 success: res => {
 					
-                        if (res.data.resultCode == 10000) {
+					if(res.data.resultCode == 10000){
 						
 						let u = uni.getStorageSync("mall_UserInfo");
-                            if (u) {
+						if(u){
 							this.getLogin_t(u)
 							typeof failed == "function" && failed(res.data);
 						}
 						
-                        } else if (res.data.resultCode != 1) {
-                            if (res.data.couponResultCode == 0) {
-
-                            } else {
+					}else  if(res.data.resultCode != 1) {
+							if( res.data.message!=''){
 								uni.showToast({
 									title: res.data.message,
 									icon: "none",
 								});
 							}
 							
+						
+							
 						   typeof failed == "function" && failed(res.data);
 						   
-                        } else {
+                    } 
+					else{
 						
                         typeof success == "function" && success(res.data);
                     }
@@ -84,8 +85,9 @@ export default {
         }
 		// token失效再次登录接口
 		Vue.prototype.getLogin_t = function(obj) {
-                let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
-                this.request2({
+			let pid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0;
+		       this.request2(
+		       	{
 		       		url: '/api/AppletLogin/Login',
 		       		data: {
 		       			Source: 1,