Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-uniapp

api/connect.js

@@ -26,7 +26,7 @@ export function webConnect(code) {
 export function openIdLogin(params, clientType) {
 	return http.request({
 		url: `passport/connect/connect/app/login`,
-		method: Method.GET,
+		method: Method.POST,
 		needToken: true,
 		data: params,
 		header: {

pages/order/fillorder.vue

@@ -4,7 +4,7 @@
     <div
       class="address-box"
       @click="clickToAddress()"
-      v-if="shippingText == 'LOGISTICS'"
+      v-if="shippingText == 'LOGISTICS' && orderMessage.cartTypeEnum != 'VIRTUAL'"
     >
       <div class="user-box flex">
         <div class="flex-8">
@@ -651,7 +651,7 @@ export default {
             });
             return false;
           }
-        } else if (this.shippingText === "LOGISTICS") {
+        } else if (this.shippingText === "LOGISTICS" && this.orderMessage.cartTypeEnum != 'VIRTUAL') {
           if (!this.address.id) {
             uni.showToast({
               title: "请选择地址",
@@ -853,7 +853,7 @@ export default {
 </script>
 <style scoped>
 page {
-  background: #ededed !important;
+  background: #f7f7f7;
 }
 </style>
 <style scoped lang="scss">

pages/passport/login.vue

@@ -453,13 +453,14 @@
 					uuid: uni.getStorageSync("openid"), //联合登陆id
 					source: uni.getStorageSync("type"), //联合登陆类型
 					nickname: uni.getStorageSync("nickname"), // 昵称
+					username: uni.getStorageSync("openid"), // 昵称
 					avatar: uni.getStorageSync("avatar"), // 头像
 					uniAccessToken: uni.getStorageSync("uni_access_token"), //第三方token
 					type:this.clientType,
-					token:{unionId:""}
+					token:{unionId:"",openId:uni.getStorageSync("openid")}
 				};
         		uni.getStorageSync("unionId") ? (params.token.unionId = uni.getStorageSync("unionId")) : delete params.token;
-	
+				
 				openIdLogin(params, clientType).then((res) => {
 					if (!res.data.success) {
 						let errormessage = "第三方登录暂不可用";

pages/tabbar/cart/cartList.vue

@@ -27,7 +27,7 @@
               <!-- #endif -->
             </u-checkbox-group>
             <span class="store-name wes store-line-desc" @click.stop="navigateToStore(item)">{{
-              item.storeName 
+              item.storeName
             }}</span>
             <u-icon @click="navigateToStore(item)"  size="24" style="margin-left:10rpx;"  name="arrow-right"></u-icon>
           </view>
@@ -88,25 +88,27 @@
                 </view>
                 <!-- 如果当有促销并且促销是 限时抢购 -->
                 <!-- promotions -->
-              <div class="promotions-list" v-if="Object.keys(skuItem.promotionMap).length != 0"
+                <div class="promotions-list" v-if="Object.keys(skuItem.promotionMap).length != 0"
-              >
+                >
-                <div class="promotions-item-seckill" v-if="getPromotion(skuItem).includes('SECKILL')">
+                  <div class="promotions-item-seckill" v-if="getPromotion(skuItem).includes('SECKILL')">
-                  距秒杀结束: <u-count-down show-border :hide-zero-day="true" :color="$mainColor" border-color="#ededed"
+                    距秒杀结束: <u-count-down show-border :hide-zero-day="true" :color="$mainColor" border-color="#ededed"
-                    font-size="24" :timestamp="getCountDownTime(skuItem)">
+                      font-size="24" :timestamp="getCountDownTime(skuItem)">
-                  </u-count-down>
+                    </u-count-down>
+                  </div>
                 </div>
-              </div> 
 
-              <!-- 此处先隐藏 对于预估到手价来说 前端无法真正的计算出来，光靠促销模式进行展示可能有些不妥。所以暂且隐藏 -->
+                <!-- 此处先隐藏 对于预估到手价来说 前端无法真正的计算出来，光靠促销模式进行展示可能有些不妥。所以暂且隐藏 -->
-              <!-- 如果有活动 并且是选中的状态,显示预估到手价格 -->
+                <!-- 如果有活动 并且是选中的状态,显示预估到手价格 -->
-              <!-- <div class="priceDetail-flowPrice" :class="{'main-color':skuItem.priceDetailDTO}"
+                <!-- <div class="priceDetail-flowPrice" :class="{'main-color':skuItem.priceDetailDTO}"
-                v-if="skuItem.priceDetailDTO && skuItem.invalid == 0  && Object.keys(skuItem.promotionMap).length != 0 && skuItem.checked && skuItem.checked">
+                  v-if="skuItem.priceDetailDTO && skuItem.invalid == 0  && Object.keys(skuItem.promotionMap).length != 0 && skuItem.checked && skuItem.checked">
-                预估到手价 ￥<span>{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
+                  预估到手价 ￥<span>{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
-                <span>.{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
+                  <span>.{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
-              </div> -->
+                </div> -->
-							<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
+                <div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
-								{{skuItem.errorMessage}}
+                  {{skuItem.errorMessage}}
-							</div>
+                </div>
+              </p>
+              
             </view>
           </view>
         </u-swipe-action>
@@ -208,7 +210,7 @@ export default {
       WEIXIN_num: "", //购物车兼容微信步进器
     };
   },
-  
+
   mounted() {
     // #ifdef MP-WEIXIN
     // 小程序默认分享
@@ -358,7 +360,7 @@ export default {
     /**
      * 点击步进器回调
      */
-     numChange: debounce(function (val) {   
+     numChange: debounce(function (val) {
       this.updateSkuNumFun(val.goodsSku.id, val.num);
     }, 1000),
     /**
@@ -469,7 +471,7 @@ export default {
       });
     },
 
-    // 数据去重一下 
+    // 数据去重一下
     getPromotion(item) {
         return Object.keys(item.promotionMap).map((child) => {
           return child.split("-")[0]
@@ -513,7 +515,7 @@ export default {
                         }
                       });
                     }
-                
+
                   });
               }
               this.checkout = checkOuted;

pages/tabbar/screen/fullScreen.vue

@@ -1,5 +1,5 @@
 <template>
-   <u-modal v-model="show" cancelText="不同意" confirmText="同意" showCancelButton="btnShow" title="服务协议和隐私政策" @confirm="confirm" @cancel="cancel">
+   <u-modal v-model="show" cancelText="不同意" confirmText="同意" showCancelButton title="服务协议和隐私政策" @confirm="confirm" @cancel="cancel">
     <view class="u-update-content">
       请您务必审慎阅读,充分理解“服务协议”和“隐私政策”各条款，
       包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识,

pages/tabbar/user/my.vue

@@ -98,7 +98,7 @@ export default {
   },
   onLoad() { },
   onShow() {
-    this.userInfo = this.$options.filters.isLogin();
+    this.userInfo = this.$options.filters.isLogin() || {};
     if (this.$options.filters.isLogin("auth")) {
       this.getUserOrderNum();
     } else {