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,10 +453,11 @@
 					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;
 				

pages/tabbar/cart/cartList.vue

@@ -107,6 +107,8 @@
                 <div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
                   {{skuItem.errorMessage}}
                 </div>
+              </p>
+              
             </view>
           </view>
         </u-swipe-action>

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 {