解决冲突

components/auth/index.vue

 <template>
 	<div class="auth-page">
-		<u-popup v-model="showDialog" mode="center" custom-style="padding:0;background:none;">
+		<u-popup v-model="showDialog" mode="center" :mask-close-able="false" custom-style="padding:0;background:none;">
 			<img :src="pageinfo.pic_url" mode="widthFix" />
 			<button :style="sureStyle" class="hotsopt" open-type="getUserInfo" @getuserinfo="getUserInfo"></button>
 			<button :style="cancelStyle" class="hotsopt" @click="close"></button>
@@ -28,6 +28,7 @@ export default {
 	methods: {
 		getUserInfo(e) {
 			var that = this;
+			that.showDialog=true;
 			uni.getProvider({
 				service: 'oauth',
 				success: function(res) {
@@ -70,6 +71,7 @@ export default {
 			});
 		},
 		close() {
+			this.showDialog=false;
 			this.$emit('gbAuth');
 		},
 		//调用获取code

components/goods/goodsaction.vue

 <template>
-  <view
-    class="actionsheet"
-    :style="{ 'padding-bottom': bian ? '28px' : '0px' }"
-  >
+	<view class="actionsheet" :style="{ 'padding-bottom': bian ? '28px' : '0px' }">
 		<view class="item" style="width:36px;" @click="goCart">
-      <view style="width: 22px; margin: auto;">
-        <u-icon name="cart-o" size="44" :color="mc"></u-icon>
-      </view>
-      <text class="text" :style="{'color':mc}">购物车</text>
+			<view style="width: 22px; margin: auto;"><u-icon name="cart-o" size="44" :color="mc"></u-icon></view>
+			<text class="text" :style="{ color: mc }">购物车</text>
 		</view>
 		<view class="item">
-      <view style="width: 22px; margin: auto;">
-        <u-icon name="chat-o" size="44" color="#333"></u-icon>
-      </view>
+			<view style="width: 22px; margin: auto;"><u-icon name="chat-o" size="44" color="#333"></u-icon></view>
 			<text class="text">客服</text>
-      <button
-        open-type="contact"
-        :send-message-title="goodName"
-        :send-message-path="path"
-        :send-message-img="g.coverPic"
-        :show-message-card="true"
-      >
-        0
-      </button>
+			<button open-type="contact" :send-message-title="goodName" :send-message-path="path" :send-message-img="g.coverPic" :show-message-card="true">0</button>
 		</view>
 		<view class="item" @click="setFavorite">
-      <view style="width: 22px; margin: auto;">
-        <u-icon
-          :name="favorStatus ? 'like' : 'like-o'"
-          size="44"
-          :color="favorStatus ? mc : '#333'"
-        ></u-icon>
-      </view>
+			<view style="width: 22px; margin: auto;"><u-icon :name="favorStatus ? 'like' : 'like-o'" size="44" :color="favorStatus ? mc : '#333'"></u-icon></view>
 			<text class="text">收藏</text>
 		</view>
 		<view class="item2">
-      <view style="flex: 1;">
-        <u-button
-          @click="joinCar"
-          :ripple="true"
-          :hair-line="false"
-          :custom-style="btn1"
-          >加入购物车</u-button
-        >
-      </view>
-      <view style="flex: 1;">
-        <u-button
-          @click="buy"
-          :ripple="true"
-          :hair-line="false"
-          :custom-style="btn2"
-          >立即购买</u-button
-        >
-      </view>
+			<view style="flex: 1;"><u-button @click="joinCar" :ripple="true" :hair-line="false" :custom-style="btn1">加入购物车</u-button></view>
+			<view style="flex: 1;"><u-button @click="buy" :ripple="true" :hair-line="false" :custom-style="btn2">立即购买</u-button></view>
 		</view>
+		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
 
 <script>
+import auth from "../../components/auth/index.vue";
 export default {
-  props: ["coverPic", "goodName", "favorite", "goodId"],
+	props: ['coverPic', 'goodName', 'favorite', 'goodId'],
 	data() {
 		return {
-      mc: "",
-      fu: "",
+			mc: '',
+			fu: '',
 			bian: false,
 			btn1: {
 				flex: 1,
-        height: "100%",
-        borderRadius: "40px 0 0 40px",
-        border: "none",
-        color: "#FFF",
-        fontSize: "13px",
-        width: "100%",
+				height: '100%',
+				borderRadius: '40px 0 0 40px',
+				border: 'none',
+				color: '#FFF',
+				fontSize: '13px',
+				width: '100%'
 			},
 			btn2: {
 				flex: 1,
-        height: "100%",
-        borderRadius: "0 40px 40px 0",
-        border: "none",
-        color: "#FFF",
-        fontSize: "13px",
-        width: "100%",
+				height: '100%',
+				borderRadius: '0 40px 40px 0',
+				border: 'none',
+				color: '#FFF',
+				fontSize: '13px',
+				width: '100%'
 			},
-      path: "",
+			path: '',
 			favorStatus: false,
+			//是否显示登陆
+			showAuth: false,
+			u: {}
 		};
 	},
+	components: {
+	  auth
+	},
 	mounted() {
 		this.mc = this.$uiConfig.mainColor;
 		this.fu = this.$uiConfig.secondary;
@@ -94,38 +65,63 @@ export default {
 		this.btn1.background = this.fu;
 		this.btn2.background = this.mc;
 		let t = getCurrentPages();
-    this.path = "/" + t[t.length - 1].route;
+		this.path = '/' + t[t.length - 1].route;
 		//console.log(t[t.length - 1]);
 		this.favorStatus = this.favorite;
 	},
 	methods: {
-    goCart(){
+		goCart() {
 			uni.redirectTo({
 				url: '/pages/cart/cart'
 			});
 		},
 		setFavorite() {
-      let h=this.apiheader()
+			this.u = uni.getStorageSync('mall_UserInfo');
+			if (!this.u) {
+				this.u = {
+					nickName: '未登录',
+					avatarUrl: ''
+				};
+				this.showAuth = true;
+			} else {
 				this.request2(
-        
 					{
 						url: '/api/AppletUser/SetUserCollectionInfo',
 						data: {
-				GoodsId:this.goodId
+							GoodsId: this.goodId
 						}
 					},
-        (res) => {
+					res => {
 						this.favorStatus = !this.favorStatus;
 					}
 				);
+			}
 		},
 		joinCar() {
-      this.$emit("join-car");
+			this.u = uni.getStorageSync('mall_UserInfo');
+			if (!this.u) {
+				this.u = {
+					nickName: '未登录',
+					avatarUrl: ''
+				};
+				this.showAuth = true;
+			} else {
+				this.$emit('join-car');
+			}
 		},
 		buy() {
-      this.$emit("buy");
+			this.$emit('buy');
 		},
+
+		reloadUserinfo() {
+			this.u = uni.getStorageSync('mall_UserInfo');
+			this.showAuth = false;
 		},
+		//关闭登录窗口
+		gbAuth(){
+			this.showAuth=false;
+		}
+	}
 };
 </script>
 

components/goods/goodsku.vue

@@ -9,7 +9,7 @@
 		:safeAreaInsetBottom="true"
 		@close="popupClose"
 		:z-index="9999"
-		close-icon="cross"
+		close-icon="close"
 	>
 		<view class="goodsku">
 			<view class="goods">
@@ -21,6 +21,9 @@
 					</view>
 					<view class="amount">库存 {{ goodamount }} {{ g.unit }}</view>
 					<view class="sku">{{ skuObj ? '已选择' : '选择' }} {{ sku }}</view>
+					<view class="sku_close">
+						<u-icon name="cross" color="#9F9F9F" @click="cloGood()" size="40"/>
+					</view>
 				</view>
 			</view>
 			<view class="sku-box">
@@ -138,7 +141,6 @@ export default {
 		};
 	},
 	mounted() {
-		console.log("good",this.good)
 		this.request2(
 			{
 				url: '/api/AppletGoods/GetAppletGoodsInfo',
@@ -147,7 +149,6 @@ export default {
 				}
 			},
 			res => {
-				console.log(res, 'resssssss');
 				this.g = res.data.goods;
 				this.goodimage = this.g.cover_pic;
 
@@ -195,7 +196,6 @@ export default {
 	},
 	methods: {
 		joinCar() {
-			console.log(this.skuObj,'skuObjj');
 			if (this.skuObj && this.skuObj.id) {
 				this.request2(
 					{
@@ -225,24 +225,38 @@ export default {
 			}
 		},
 		buy() {
+			let ShoppingCartIdList=[];
 			if (this.skuObj && this.skuObj.id) {
+				let good = {
+					DetailList: [],
+					Use_Integral: 0,
+					User_Coupon_Id: 0,
+					DeliveryMethod:0,
+					AddressId:0,
+				};
 				let g = {
-					id: this.skuObj.goods_id,
-					num: this.gc,
-					cart_id: 0,
-					goods_attr_id: this.skuObj.id,
-					attr: []
+					GoodsId: this.skuObj.goods_id,
+					Number: this.gc,
+					SpecificationSort: this.skuObj.sign_id,
 				};
-				this.skuObj.attr_list.forEach(x => {
-					g.attr.push({
-						attr_id: x.attr_id,
-						attr_group_id: x.attr_group_id
-					});
-				});
-				this.forms.list[0].goods_list.push(g);
-				this.forms.list[0].mch_id = this.g.mch_id;
+				good.DetailList.push(g);
+				// let g = {
+				// 	id: this.skuObj.goods_id,
+				// 	num: this.gc,
+				// 	cart_id: 0,
+				// 	goods_attr_id: this.skuObj.id,
+				// 	attr: []
+				// };
+				// this.skuObj.attr_list.forEach(x => {
+				// 	g.attr.push({
+				// 		attr_id: x.attr_id,
+				// 		attr_group_id: x.attr_group_id
+				// 	});
+				// });
+				// this.forms.list[0].goods_list.push(g);
+				// this.forms.list[0].mch_id = this.g.mch_id;
 				uni.navigateTo({
-					url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(this.forms)),
+					url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(good))+'&IsFormShoppingCart=2&ShoppingCartIdList='+JSON.stringify(ShoppingCartIdList),
 					complete(res) {
 						console.log(res);
 					}
@@ -256,7 +270,8 @@ export default {
 				});
 			}
 		},
-		close() {
+		//关闭弹窗
+		cloGood() {
 			this.popupClose();
 		},
 		clickSkuItemHandler(index, groupRow) {
@@ -406,6 +421,12 @@ export default {
 	margin-left: 15px;
 	flex: 1;
 	width: 1px;
+	position: relative;
+}
+.goodsku .chosen-info .sku_close{
+	position: absolute;
+	right: 4px;
+	top: 5px;
 }
 .goodsku .goods .chosen-info .price {
 	font-size: 24px;

components/userbox/index.vue

@@ -4,7 +4,7 @@
       <img :src="u.avatarUrl" />
       <div class="text">{{u.nickName}}</div>
     </div>
-    <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"></auth>
+    <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
   </div>
 </template>
 
@@ -35,6 +35,10 @@ export default {
     reloadUserinfo() {
       this.u = uni.getStorageSync("mall_UserInfo");
       this.showAuth=false
+    },
+	//关闭登录窗口
+	gbAuth(){
+		this.showAuth=false;
 	}
   }
 };

pages/address/address.vue

@@ -60,7 +60,7 @@
       @confirm="confirm"
     ></u-modal>
     <u-toast ref="uToast" />
-    <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"  @gbAuth= 'goback'></auth>
+    <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"  @gbAuth= 'gbAuth'></auth>
   </view>
 </template>
 
@@ -167,8 +167,9 @@ export default {
       this.showAuth = false;
 	  this.init();
     },
-	goback(){
-		uni.navigateBack()
+	//关闭登录窗口
+	gbAuth(){
+		this.showAuth=false;
 	},
     isdefault(item) {
       //设置默认地址

pages/coupon/index/index.vue

@@ -78,7 +78,7 @@
     </view>
     <!-- 取消提示 -->
     <u-toast ref="uToast" />
-   <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'goback'></auth>
+   <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
   </view>
 </template>
 
@@ -193,8 +193,9 @@ export default {
 	  this.showAuth=false;
 	  this.init();
 	},
-	goback(){
-		uni.navigateBack()
+	//关闭登录窗口
+	gbAuth(){
+		this.showAuth=false;
 	},
 	godetails(item){
 		if(this.msg.UseState ==0){

pages/favorite/favorite.vue

@@ -65,7 +65,7 @@
 			  </view>
 		</template>
 		<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'goback'></auth>
+		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
 	</view>
 </template>
 
@@ -174,7 +174,6 @@
 					res => {
 							uni.hideLoading();
 						if(res.resultCode==1){
-							
 							this.goodslist = this.goodslist.concat(res.data.pageData);
 							 this.page_count = res.data.pageCount;
 							 if (this.page_count == 1) {
@@ -199,8 +198,9 @@
 			  this.showAuth=false;
 			  this.init();
 			},
-			goback(){
-				uni.navigateBack()
+			//关闭登录窗口
+			gbAuth(){
+				this.showAuth=false;
 			},
 			clickHandler(cx) {
 			  uni.navigateTo({

pages/foot/index/index.vue

@@ -75,7 +75,7 @@
 			</scroll-view>
 			
 		</view>
-		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'goback'></auth>
+		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
 		<view class="loading" v-show="loading">
 			<u-loading mode="flower" size="48"></u-loading>
 			<Text style='color: #fff;margin-top: 10rpx;'>加载中...</Text>
@@ -255,8 +255,9 @@
 			  this.showAuth=false;
 				  this.init(); //成功之后调取接口
 			},
-			goback(){
-				uni.navigateBack()
+			//关闭登录窗口
+			gbAuth(){
+				this.showAuth=false;
 			},
 			change(index) {
 				this.current = index;

pages/goods/goods.vue

@@ -61,7 +61,7 @@
         <view class="label">选择</view>
         <view class="content">
           <view class="sku-chosen" @click="chosenSku">
-            <view class="sku">{{ currentSku ? "已" : "" }}选择 {{ sku }} </view>
+            <view class="sku">{{ currentSku.attr_list.length>0 ? "已" : "请" }}选择 {{ sku }} </view>
             <view class="arrow">
               <u-icon name="arrow" :size="32" color="#111"></u-icon>
             </view>

pages/order-submit/order-submit.vue

@@ -221,7 +221,7 @@ export default {
 			goodData: [],
 			showGoodList: false,
 			DetailList: [],
-			IsFormShoppingCart: 1,
+			IsFormShoppingCart: 2,
 			adressInfo: {},
 			payInfo: {
 				OpenId: 'ow_7I5XC1-RGwwk8QANBmWKYKmOc',
@@ -229,7 +229,7 @@ export default {
 				OrderPayType: 1,
 				GoodsName: ''
 			},
-			ShoppingCartIdList: [6, 5]
+			ShoppingCartIdList: []
 		};
 	},
 	onLoad(option) {

pages/user-center/integral-detail/integral-detail.vue

@@ -52,7 +52,7 @@
     <!-- 取消提示 -->
 
     <u-toast ref="uToast" />
-   <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'goback'></auth>
+   <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
    
   </view>
 </template>
@@ -173,9 +173,10 @@ export default {
 	  this.showAuth=false;
 	  this.init();
 	},
-	goback(){
-		uni.navigateBack()
-	},
+	//关闭登录窗口
+	gbAuth(){
+		this.showAuth=false;
+	}
   },
 };
 </script>