1

components/auth/index.vue

@@ -349,7 +349,7 @@ export default {
             };
             // console.log(app.serverUrl + '/login/' + res.authCode);
             // 调用自己的服务端接口，让服务端进行后端的授权认证
-            // that.getBaseInfoAli();
+            that.getBaseInfoAli();
             console.log(327, res);
             that.getCodeAli(obj);
           }
@@ -366,16 +366,16 @@ export default {
       my.getOpenUserInfo({
         success: (res) => {
           let userInfo = JSON.parse(res.response).response; // 以下方的报文格式解析两层 response
-          console.log(res, userInfo);
+          console.log(369, res, userInfo);
         },
       });
     },
     //调用获取code
     getCodeAli(obj) {
       var that = this;
-      uni.showLoading({
-        title: "登录中",
-      });
+      // uni.showLoading({
+      //   title: "登录中",
+      // });
       //这里请求接口
       var OpenId = "";
       that.request2(
@@ -387,9 +387,8 @@ export default {
         },
         (res) => {
           if (res.resultCode == 1) {
-            console.log("390", res);
-            // obj.OpenId = res.data;
-            // that.getLogin(obj);
+            obj.OpenId = res.data;
+            // that.getLoginAli(obj);
           }
         }
       );

pages/guidecar/pickcarcity.vue

@@ -167,9 +167,8 @@ export default {
         Name = item.Name;
       }
       let pages = getCurrentPages(); // 当前页面
-      let beforePage;
+      let beforePage = null;
       beforePage = pages[pages.length - 2]; // 前一个页面
-      // console.log( beforePage.$vm)
       setTimeout(() => {
         uni.navigateBack({
           delta: 1,

pages/ticketCoupons/list.vue

@@ -113,12 +113,21 @@
     >
       <canlendar @finish="chosenDateResult"></canlendar>
     </u-popup>
+    <view class="no-data" v-if="dataList.length === 0">
+      <image
+        src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/no-data.png"
+        mode="aspectFit"
+        class="no-data-img"
+      ></image>
+      <view class="zhanwu"> 暂无数据 </view>
+    </view>
     <scroll-view
       :scroll-y="true"
       :enable-back-to-top="true"
       :enable-flex="true"
       @scrolltolower="lower"
       style="height: calc(100% - 224rpx); padding-bottom: 0px"
+      v-if="dataList.length > 0"
     >
       <view class="ticket-list">
         <view
@@ -681,4 +690,21 @@ export default {
     }
   }
 }
+.no-data {
+  .no-data-img {
+    width: 180rpx;
+    height: 240rpx;
+    margin-left: 50%;
+    transform: translateX(-50%);
+  }
+
+  .zhanwu {
+    text-align: center;
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #999999;
+    margin-top: 20rpx;
+  }
+}
 </style>

pages/ticketCoupons/policyDetail.vue

@@ -111,6 +111,9 @@ export default {
   onLoad(options) {
     this.ID = options.id;
     this.getDetail();
+    uni.setNavigationBarTitle({
+      title: "景区详细信息",
+    });
   },
   onPageScroll(res) {},
   methods: {