小程序部分修改

pages/goods/goods.vue

@@ -422,7 +422,7 @@ export default {
     },
     //关闭登录窗口
     gbAuth() {
-      uni.navigateBack();
+      this.showAuth = false
     },
     initPage() {
       let currentPages = getCurrentPages();
@@ -573,8 +573,13 @@ export default {
       this.ot = 1;
     },
     chosenSku() {
-      this.showSku = true;
-      this.ot = 2;
+     
+	  if(this.u){
+		  this.showSku = true;
+		  this.ot = 2;
+	  }else{
+		  this.showAuth  = true
+	  }
     },
     closeSkuChosen(obj) {
       this.sku = "";

pages/order/index/index.vue

@@ -509,6 +509,7 @@ export default {
 			  	data: that.Cancelmsg
 			  },
 			  (res) => {
+				  that.showModal = false;
 				if(that.Cancelmsg.Type==1){
 					uni.showToast({
 						title:res.message,

pages/order/order-detail.vue

@@ -484,6 +484,7 @@ export default {
 					data: that.Cancelmsg
 				},
 				(res) => {
+					that.showModal = false;
 					uni.showToast({
 						title:res.message,
 						icon:'none'

pages/share/level/level_t.vue

@@ -11,11 +11,11 @@
 					</view>
 				</view>
 				<text style="margin-top: 5px;font-size: 13px;">自购返利:{{level.GradeInfo.CommissionRatio}}%</text>
-				<u-line-progress active-color="#2979ff" :striped-active="true" :percent="(level.GradeInfo.MeetNum/level.GradeInfo.UpgradeNum)*100"></u-line-progress>
-				<text style="margin-top: 5px;font-size: 13px;">{{level.GradeInfo.MeetNum}}/{{level.GradeInfo.UpgradeNum}}</text>
 				<view style="width: 100%;height: 1px;background: #F8F6F5;margin: 5px 0;"></view>
 				<text style="font-size: 14px;" v-if="level.GradeInfo.UpgradeNum-level.GradeInfo.MeetNum!=0">还需要：{{level.GradeInfo.UpgradeNum-level.GradeInfo.MeetNum}}个{{level.GradeInfo.UpgradeIdName}}</text>
 				<text style="font-size: 14px;" v-if="level.GradeInfo.UpgradeNum-level.GradeInfo.MeetNum==0">已满足升级条件</text>
+				<u-line-progress active-color="#2979ff" :striped-active="true" :percent="(level.GradeInfo.MeetNum/level.GradeInfo.UpgradeNum)*100"></u-line-progress>
+				<text style="margin-top: 5px;font-size: 13px;">{{level.GradeInfo.MeetNum}}/{{level.GradeInfo.UpgradeNum}}</text>
 			</view>
 		</view>
 	

plugin/api.js

@@ -51,13 +51,11 @@ export default {
 					if(res.data.resultCode == 10000){
 						
 						let u = uni.getStorageSync("mall_UserInfo");
-						// let u = {
-						// 	OpenId:'ow_7I5elwCN5OBcQVW0pkjXC_P7k',
-						// 	Name:"哈哈",
-						// 	Photo:"https://wx.qlogo.cn/mmopen/vi_32/zd9lKwHQVM5darszb5rfibhVp8yAiaT1YmHguxibzpjDz9MvbyHibpfBgBfibqhibChiaTDKTcicnZ2Y9k51PTibMdyMggA/132"
-						// }
-						this.getLogin_t(u)
-					  typeof failed == "function" && failed(res.data);
+						if(u){
+							this.getLogin_t(u)
+							typeof failed == "function" && failed(res.data);
+						}
+						
 					}else  if(res.data.resultCode != 1) {
 							uni.showToast({
 								title: res.data.message,