modify: warning

src/app.wxss

 /**app.wxss**/
+page {
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #f2f4f7;
+  font-size: 30rpx;
+  font-family:"iconfont-711" !important;
+}
+
 .container {
   height: 100%;
   display: flex;

src/base/base.wxss

 @charset "UTF-8";
 /* 重置样式 start */
-body, dl, dd, h1, h2, h3, h4, h5, h6, p, hr, form {
-  margin: 0; }
+/* body, dl, dd, h1, h2, h3, h4, h5, h6, p, hr, form {
+  margin: 0; } */
 
-h1, h2, h3, h4, h5, h6 {
-  font-weight: normal; }
+/* h1, h2, h3, h4, h5, h6 {
+  font-weight: normal; } */
 
-ol, ul {
+/* ol, ul {
   margin: 0;
   padding: 0;
   list-style: none; }
 
 a {
-  text-decoration: none; }
+  text-decoration: none; } */
 
-button, input {
-  padding: 0; }
+/* button, input {
+  padding: 0; } */
 
-i {
-  font-style: normal; }
+/* i {
+  font-style: normal; } */
 
 .df {
   display: flex;
@@ -164,12 +164,6 @@ i {
 .bg-fff {
   background-color: #fff; }
 
-page {
-  width: 100%;
-  box-sizing: border-box;
-  background-color: #f2f4f7;
-  font: 14px/1.5 "Microsoft Yahei", Helvetica Neue, Helvetica, STHeiTi, sans-serif; }
-
 .nowrap {
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -262,13 +256,7 @@ page {
  * Copyright 2016, wechat ui team
  * MIT license
  */
- page {
-  line-height: 1.6;
-  font-family: -apple-system-font, "Helvetica Neue", sans-serif;
-}
-icon {
-  vertical-align: middle;
-}
+
 .weui-cells {
   position: relative;
   margin-top: 1.17647059em;

src/component/authorization-modal/authorization-modal.wxml

@@ -2,7 +2,7 @@
     <view class="modal-mask"></view>
     <view class="modal-container">
       <view class='auth-avatar'>
-        <image src='/assets/imgs/auth-avatar.png'></image>
+        <image class='auth-avatar-img' src='/assets/imgs/auth-avatar.png'></image>
       </view>
       <view class='auth-shop'>
         广东7-Eleven申请获取授权，用于会员服务
@@ -15,7 +15,7 @@
         </view>
       </view>
       <view class='close' bindtap='close'>
-        <image src='/assets/imgs/close.png'></image>
+        <image class='close-img' src='/assets/imgs/close.png'></image>
       </view>
     </view>
   </view>
\ No newline at end of file

src/component/authorization-modal/authorization-modal.wxss

@@ -35,7 +35,7 @@
   height: 126rpx;
   margin: 120rpx auto 92rpx;
 }
-.auth-avatar image{
+.auth-avatar-img{
   width: 126rpx;
   height: 126rpx;
 }
@@ -67,7 +67,7 @@
 .rule-wrap{
   margin-left: 76rpx;
 }
-.close image{
+.close-img{
   width: 58rpx;
   height: 58rpx;
   position: absolute;

src/component/imageSwiper/imageSwiper.wxml

@@ -4,9 +4,10 @@
   autoplay="{{autoplay}}"
   interval="{{interval}}"
   duration="{{duration}}"
+  class="image-swiper"
 >
   <block wx:for="{{imageData}}" wx:key="{{item}}">
-    <swiper-item>
+    <swiper-item class="swiper-item">
       <image src="http://testimg3.bigaka.com{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" bindtap='preview' class="slide-image" />
     </swiper-item>
   </block>

src/component/imageSwiper/imageSwiper.wxss

 /* component/imageSwiper/imageSwiper.wxss */
-swiper{
+.image-swiper{
   height: 420rpx;
 }
-swiper image{
-   width: 100%;
-   height:100%;
-   border-radius:7rpx;
-}
-swiper-item{
+.swiper-item{
   border-radius: 10rpx;
   height: 374rpx;
+}
+.slide-image {
+  width: 100%;
+  height: 100%;
+  border-radius:7rpx;
 }
\ No newline at end of file

src/component/personCenter/personCenter.wxss

@@ -2,7 +2,6 @@
 @import './../../base/base.wxss';
 .user-content{
   height: 92rpx;
-  /* width: 598rpx; */
   padding: 28rpx 35rpx 0 50rpx;
   box-sizing: border-box;
 }
@@ -30,18 +29,8 @@
   color: #333333;
   margin-bottom: 15rpx;
   letter-spacing: 1.5rpx;
-
-}
-.activation-content button{
-  width: 400rpx;
-  height: 68rpx;
-  border-radius: 68rpx;
-  line-height: 68rpx;
-  font-size: 30rpx;
-  position: absolute;
-  top: 49rpx;
-  left: 144rpx;
 }
+
 .activation-bg{
   border-radius: 10rpx;
   box-shadow: 0 0 10px #ccc ;
@@ -63,7 +52,7 @@
 }
 
 .user-name{
-  /* margin-bottom: 12rpx; */
+  margin-bottom: 15rpx;
 }
 .icon-edit{
   width: 28rpx;
@@ -76,10 +65,7 @@
   color: #666666;
   font-size: 24rpx;
 }
-.qr-code image{
-  width: 100rpx;
-  height: 100rpx;
-}
+
 .person-right {
   border-right: 1px solid #c8c9c9;
 }
@@ -96,7 +82,7 @@
 }
 .user-name-content {
   position: absolute;
-  top: 7rpx;
+  top: 11rpx;
 }
 
 .member-unActive{
@@ -112,5 +98,5 @@
   letter-spacing:2rpx;
 }
 .un-active-btn{
-  font-family:"iconfont-711" !important;
+  /* font-family:"iconfont-711" !important; */
 }
\ No newline at end of file

src/pages/couponCodeDetail/couponCodeDetail.js

@@ -25,8 +25,9 @@ wxService.page({
     // 条形码
     if(cardno){
       wxbarcode.barcode('barcode', cardno, 600, 180);
-
       this.getCouponDetail(cardno)
+
+      console.log('cardno', cardno)
     }
   },
   onLoad() {

src/pages/coupons/coupons.js

@@ -109,6 +109,7 @@ wxService.page({
     }
 
     wxService.post(`/coupon/coupon/listWithMember4Mina?number=${pageNo}&size=${pageSize}`, params).then(res => {
+      if(!res) return false
       const {result,data} = res.data
       if(result == 0){
          wx.hideLoading()

src/pages/deliveryService/deliveryService.js

@@ -55,6 +55,7 @@ wxService.page({
       title: '加载中'
     })
     wxService.post(`/merchant/modelPage/getDetailById?pageId=4&brandId=${app.globalData.brandId}`).then(res => {
+      if(!res) return false
       const {result,data} = res.data
       if(result == 0){
         // 动态设置title

src/pages/memberOfOwn/memberOfOwn.js

@@ -57,6 +57,7 @@ wxService.page({
         // 获取会员信息
         this.getMemberFind()
         // 条形码
+        console.log('memberCardNo',memberCardNo)
         wxbarcode.barcode('barcode', memberCardNo, 500, 120);
       })
     }
@@ -100,6 +101,7 @@ wxService.page({
       cardNoOnline: this.data.memberCardNo
     }
     wxService.post(`/member/find`,params).then(res => {
+      if(!res) return false
       const { result, data } = res && res.data || res && res.result
       if (result == 0) {
         wx.hideLoading()
@@ -121,6 +123,9 @@ wxService.page({
       }
     })
   },
+  canvasIdErrorCallback (e) {
+    console.log('code-me', e.detail.errMsg)
+  },
   // 更新
   handelMemberUplate(params){
     wx.showLoading({

src/pages/memberOfOwn/memberOfOwn.wxml

@@ -16,7 +16,7 @@
 			</view>-->
 		</view>
 		<view class='user-qr-code'>
-			<canvas canvas-id="barcode" />
+			<canvas canvas-id="barcode" binderror="canvasIdErrorCallback" />
 		</view>
 	</view>
 

src/pages/userCenter/userCenter.js

@@ -88,11 +88,18 @@ wxService.page({
       title: '加载中'
     })
     wxService.post(`/coupon/coupon/memberCouponCount`).then(res => {
-      const { result, data } = res && res.data && res.data.result
-      if (result == 0) {
-        wx.hideLoading()
-        this.setData({
-          couponNum: data && data[1] || 0
+      if(res){
+        const { result, data } = res && res.data
+        if (result == 0) {
+          wx.hideLoading()
+          this.setData({
+            couponNum: data && data[1] || 0
+          })
+        }
+      } else {
+        wx.showToast({
+          title: '请求失败',
+          icon: 'none'
         })
       }
     })
@@ -150,6 +157,7 @@ wxService.page({
       title: '加载中'
     })
     wxService.post(`/merchant/modelPage/getDetailById?pageId=3&brandId=${app.globalData.brandId}`).then(res => {
+      if(!res) return false
       const {result,data} = res.data
       if(result == 0){
         // 动态设置title

src/pages/userCenter/userCenter.wxss

@@ -52,7 +52,7 @@ page {
   font-size: 32rpx;
   font-weight: 700;
   letter-spacing:2rpx;
-  font-family:"iconfont-711" !important;
+  /* font-family:"iconfont-711" !important; */
 }
 
 .footer-arrow {