Просмотр исходного кода

1. 修改一个SDK版本兼容问题
通过删除 report-submit='true'
2. 调整未读消息叠加红字的处理方式

yll 4 лет назад
Родитель
Сommit
d0073ffbcf

+ 1 - 18
view/xcx/app.js

@@ -94,6 +94,7 @@ App({
     userInfo:{},
     userInfo:{},
     loginType:'routine',
     loginType:'routine',
     isFixed: false,
     isFixed: false,
+    unread: 0,  // 未读消息条数
   },
   },
   /**
   /**
    * 聊天事件快捷注册
    * 聊天事件快捷注册
@@ -117,24 +118,6 @@ App({
   {
   {
     return util.$h;
     return util.$h;
   },
   },
-
-  /**
-   * update unread message tip
-   * @param {int} newval 
-   */
-  updateUnread: function(newval)
-  {
-    if (newval != undefined && newval > 0) {
-      wx.setTabBarBadge({
-        index: 2,
-        text: newval.toString(),
-      });
-    } else {
-      wx.removeTabBarBadge({
-        index: 2,
-      });
-    }
-  },
   
   
   /*
   /*
   * 合并数组
   * 合并数组

+ 2 - 2
view/xcx/pages/activity/goods_combination_status/index.wxml

@@ -39,14 +39,14 @@
       </view>
       </view>
     
     
       <!-- 分享团后进入页面-我要参团 -->
       <!-- 分享团后进入页面-我要参团 -->
-      <form bindsubmit="goPinkOrder" report-submit='true' wx:if="{{!isOk && !userBool}}" > 
+      <form bindsubmit="goPinkOrder" wx:if="{{!isOk && !userBool}}" > 
         <button class='teamBnt bg-color' form-type="submit" hover-class='none'>我要参团</button>
         <button class='teamBnt bg-color' form-type="submit" hover-class='none'>我要参团</button>
       </form>
       </form>
 
 
       <!-- 本人开团或者拼团后按钮邀请好友参团 -->
       <!-- 本人开团或者拼团后按钮邀请好友参团 -->
       <!-- <button class='teamBnt bg-color' open-type='share' wx:elif="{{!isOk && userBool}}">邀请好友参团</button> -->
       <!-- <button class='teamBnt bg-color' open-type='share' wx:elif="{{!isOk && userBool}}">邀请好友参团</button> -->
       <view class='teamBnt bg-color' bindtap='getPinkPoster' wx:elif="{{!isOk && userBool}}">邀请好友参团</view>
       <view class='teamBnt bg-color' bindtap='getPinkPoster' wx:elif="{{!isOk && userBool}}">邀请好友参团</view>
-      <form bindsubmit="removePink" report-submit='true' wx:if="{{!isOk && userBool && pinkT.uid==userInfo.uid}}" > 
+      <form bindsubmit="removePink" wx:if="{{!isOk && userBool && pinkT.uid==userInfo.uid}}" > 
         <button class='cancel' form-type="submit" hover-class='none'>
         <button class='cancel' form-type="submit" hover-class='none'>
           <text class='iconfont icon-guanbi3'></text>取消开团
           <text class='iconfont icon-guanbi3'></text>取消开团
         </button>
         </button>

+ 1 - 1
view/xcx/pages/admin/order_deliver/index.wxml

@@ -15,7 +15,7 @@
       </view>
       </view>
       <view class="line"><image src="/images/line.jpg"></image></view>
       <view class="line"><image src="/images/line.jpg"></image></view>
     </view>
     </view>
-    <form bindsubmit="formSubmit" report-submit='true'>
+    <form bindsubmit="formSubmit">
       <view class="wrapper">
       <view class="wrapper">
           <view class="item acea-row row-between-wrapper">
           <view class="item acea-row row-between-wrapper">
             <view>发货方式</view>
             <view>发货方式</view>

+ 1 - 1
view/xcx/pages/goods_comment_con/index.wxml

@@ -1,5 +1,5 @@
 <navbar parameter='{{parameter}}'></navbar>
 <navbar parameter='{{parameter}}'></navbar>
-<form bindsubmit="formSubmit" report-submit='true'>
+<form bindsubmit="formSubmit">
 <view class='evaluate-con'>
 <view class='evaluate-con'>
    <view class='goodsStyle acea-row row-between'>
    <view class='goodsStyle acea-row row-between'>
       <view class='pictrue'><image src='{{productInfo.image}}'></image></view>
       <view class='pictrue'><image src='{{productInfo.image}}'></image></view>

+ 1 - 1
view/xcx/pages/goods_details/index.js

@@ -207,7 +207,7 @@ Page({
         'sharePacket.isState': isState,
         'sharePacket.isState': isState,
         uid: res.data.uid
         uid: res.data.uid
       });
       });
-      app.updateUnread(res.data.notice)
+      app.globalData.unread = res.data.notice
     });
     });
   },
   },
   /**
   /**

+ 1 - 1
view/xcx/pages/goods_return/index.wxml

@@ -1,5 +1,5 @@
 <navbar parameter='{{parameter}}'></navbar>
 <navbar parameter='{{parameter}}'></navbar>
-<form  bindsubmit="subRefund" report-submit='true'>
+<form  bindsubmit="subRefund">
   <view class='apply-return'>
   <view class='apply-return'>
     <view class='goodsStyle acea-row row-between' wx:for="{{orderInfo.cartInfo}}" wx:key='index'>
     <view class='goodsStyle acea-row row-between' wx:for="{{orderInfo.cartInfo}}" wx:key='index'>
         <view class='pictrue'><image src='{{item.productInfo.image}}'></image></view>
         <view class='pictrue'><image src='{{item.productInfo.image}}'></image></view>

+ 19 - 0
view/xcx/pages/index/index.js

@@ -164,6 +164,25 @@ Page({
         that.loadNotifications()
         that.loadNotifications()
       }, 1000 * 60 * 3)
       }, 1000 * 60 * 3)
     })
     })
+    this.updateUnread()
+  },
+
+  /**
+   * update unread message tip
+   * @param {int} newval 
+   */
+  updateUnread: function()
+  {
+    if (app.globalData.unread != undefined && app.globalData.unread > 0) {
+      wx.setTabBarBadge({
+        index: 2,
+        text: app.globalData.unread.toString(),
+      });
+    } else {
+      wx.removeTabBarBadge({
+        index: 2,
+      });
+    }
   },
   },
 
 
   // 加载通知,目前只有跑马灯
   // 加载通知,目前只有跑马灯

+ 2 - 2
view/xcx/pages/message/index.js

@@ -91,7 +91,7 @@ Page({
           unread += 1
           unread += 1
         }
         }
       })
       })
-      app.updateUnread(unread)
+      app.globalData.unread = unread
 
 
       that.setData({
       that.setData({
         messages: res.data,
         messages: res.data,
@@ -109,7 +109,7 @@ Page({
         that.setData({
         that.setData({
           unread: that.data.unread-1,
           unread: that.data.unread-1,
         })
         })
-        app.updateUnread(that.data.unread)
+        app.globalData.unread = res.data.unread
       })
       })
       
       
     }
     }

+ 3 - 3
view/xcx/pages/order_addcart/order_addcart.wxml

@@ -78,15 +78,15 @@
      </view>
      </view>
      <view class='money acea-row row-middle' wx:if='{{footerswitch==true}}'>
      <view class='money acea-row row-middle' wx:if='{{footerswitch==true}}'>
         <text class='font-color'>¥{{selectCountPrice}}</text>
         <text class='font-color'>¥{{selectCountPrice}}</text>
-        <form bindsubmit="subOrder" report-submit='true'>
+        <form bindsubmit="subOrder">
             <button class='placeOrder bg-color' formType="submit">立即下单</button>
             <button class='placeOrder bg-color' formType="submit">立即下单</button>
         </form>
         </form>
      </view>
      </view>
      <view class='button acea-row row-middle' wx:else>
      <view class='button acea-row row-middle' wx:else>
-       <form bindsubmit="subCollect" report-submit='true'>
+       <form bindsubmit="subCollect">
          <button class='bnt cart-color' formType="submit">收藏</button>
          <button class='bnt cart-color' formType="submit">收藏</button>
        </form>
        </form>
-       <form bindsubmit="subDel" report-submit='true'>
+       <form bindsubmit="subDel">
          <button class='bnt' formType="submit">删除</button>
          <button class='bnt' formType="submit">删除</button>
        </form>
        </form>
      </view>
      </view>

+ 1 - 1
view/xcx/pages/order_details/index.js

@@ -148,7 +148,7 @@ Page({
     getUserInfo().then(res=>{
     getUserInfo().then(res=>{
       that.data.payMode[1].number = res.data.now_money;
       that.data.payMode[1].number = res.data.now_money;
       that.setData({ payMode: that.data.payMode });
       that.setData({ payMode: that.data.payMode });
-      app.undateUnread(res.data.notice.toString());
+      app.globalData.unread = res.data.notice
     })
     })
   },
   },
   /**
   /**

+ 1 - 1
view/xcx/pages/order_list/index.js

@@ -62,7 +62,7 @@ Page({
     getUserInfo().then(res=>{
     getUserInfo().then(res=>{
       that.data.payMode[1].number = res.data.now_money;
       that.data.payMode[1].number = res.data.now_money;
       that.setData({ payMode: that.data.payMode});
       that.setData({ payMode: that.data.payMode});
-      app.updateUnread(res.data.notice.toString());
+      app.globalData.unread = res.data.notice
     });
     });
   },
   },
   /**
   /**

+ 1 - 1
view/xcx/pages/order_pay_status/index.wxml

@@ -39,7 +39,7 @@
     <view bindtap="goOrderDetails" wx:if="{{order_pay_info.paid==0 && status==2}}">
     <view bindtap="goOrderDetails" wx:if="{{order_pay_info.paid==0 && status==2}}">
       <button class='returnBnt bg-color' hover-class='none'>重新支付</button>
       <button class='returnBnt bg-color' hover-class='none'>重新支付</button>
    </view>
    </view>
-   <form bindsubmit="goIndex" report-submit='true'>
+   <form bindsubmit="goIndex">
     <button  class='returnBnt cart-color' formType="submit" hover-class='none'>返回首页</button>
     <button  class='returnBnt cart-color' formType="submit" hover-class='none'>返回首页</button>
    </form>
    </form>
 </view>
 </view>

+ 1 - 1
view/xcx/pages/user/user.js

@@ -76,7 +76,7 @@ Page({
         orderStatusNum: res.data.orderStatusNum,
         orderStatusNum: res.data.orderStatusNum,
         [generalContent]:`您在商城累计消费金额仅差 ${res.data.promoter_price || 0}元即可开通推广权限`
         [generalContent]:`您在商城累计消费金额仅差 ${res.data.promoter_price || 0}元即可开通推广权限`
       });
       });
-      app.updateUnread(res.data.notice.toString());
+      app.globalData.unread = res.data.notice
     });
     });
   },
   },
   generalWindow:function(){
   generalWindow:function(){

+ 1 - 1
view/xcx/pages/user_address/index.wxml

@@ -1,6 +1,6 @@
 <navbar parameter='{{parameter}}'></navbar>
 <navbar parameter='{{parameter}}'></navbar>
 
 
-<form bindsubmit="formSubmit" report-submit='true'>
+<form bindsubmit="formSubmit">
 <view class='addAddress'>
 <view class='addAddress'>
    <view class='list'>
    <view class='list'>
       <view class='item acea-row row-between-wrapper'>
       <view class='item acea-row row-between-wrapper'>

+ 1 - 1
view/xcx/pages/user_cash/index.js

@@ -52,7 +52,7 @@ Page({
     var that = this;
     var that = this;
     getUserInfo().then(res=>{
     getUserInfo().then(res=>{
       that.setData({ userInfo: res.data });
       that.setData({ userInfo: res.data });
-      app.updateUnread(res.data.notice.toString());
+      app.globalData.unread = res.data.notice
     });
     });
   },
   },
   swichNav: function (e) {
   swichNav: function (e) {

+ 3 - 3
view/xcx/pages/user_cash/index.wxml

@@ -9,7 +9,7 @@
     </view>
     </view>
      <view class='wrapper'>
      <view class='wrapper'>
         <view hidden='{{currentTab != 0}}' class='list'>
         <view hidden='{{currentTab != 0}}' class='list'>
-          <form bindsubmit="subCash" report-submit='true'>
+          <form bindsubmit="subCash">
              <view class='item acea-row row-between-wrapper'>
              <view class='item acea-row row-between-wrapper'>
                  <view class='name'>持卡人</view>
                  <view class='name'>持卡人</view>
                  <view class='input'><input placeholder='请输入持卡人姓名' placeholder-class='placeholder' name="name"></input></view>
                  <view class='input'><input placeholder='请输入持卡人姓名' placeholder-class='placeholder' name="name"></input></view>
@@ -36,7 +36,7 @@
           </form>  
           </form>  
         </view>
         </view>
         <view hidden='{{currentTab != 1}}' class='list'>
         <view hidden='{{currentTab != 1}}' class='list'>
-          <form bindsubmit="subCash" report-submit='true'>
+          <form bindsubmit="subCash">
              <view class='item acea-row row-between-wrapper'>
              <view class='item acea-row row-between-wrapper'>
                  <view class='name'>账号</view>
                  <view class='name'>账号</view>
                  <view class='input'><input placeholder='请填写您的微信账号' placeholder-class='placeholder' name="name"></input></view>
                  <view class='input'><input placeholder='请填写您的微信账号' placeholder-class='placeholder' name="name"></input></view>
@@ -50,7 +50,7 @@
           </form>   
           </form>   
         </view>
         </view>
         <view hidden='{{currentTab != 2}}' class='list'>
         <view hidden='{{currentTab != 2}}' class='list'>
-          <form bindsubmit="subCash" report-submit='true'>
+          <form bindsubmit="subCash">
               <view class='item acea-row row-between-wrapper'>
               <view class='item acea-row row-between-wrapper'>
                  <view class='name'>账号</view>
                  <view class='name'>账号</view>
                  <view class='input'><input placeholder='请填写您的支付宝账号' placeholder-class='placeholder' name="name"></input></view>
                  <view class='input'><input placeholder='请填写您的支付宝账号' placeholder-class='placeholder' name="name"></input></view>

+ 1 - 1
view/xcx/pages/user_info/index.js

@@ -124,7 +124,7 @@ Page({
             that.setData({userIndex:i});
             that.setData({userIndex:i});
           }
           }
       }
       }
-      app.updateUnread(res.data.notice.toString());
+      app.globalData.unread = res.data.notice
     });
     });
   },
   },
 
 

+ 1 - 1
view/xcx/pages/user_info/index.wxml

@@ -1,5 +1,5 @@
 <navbar parameter='{{parameter}}'></navbar>
 <navbar parameter='{{parameter}}'></navbar>
-<form bindsubmit="formSubmit" report-submit='true'>
+<form bindsubmit="formSubmit">
   <view class='personal-data'>
   <view class='personal-data'>
   <view class="wrapper">
   <view class="wrapper">
       <view class="title">管理我的账号</view>
       <view class="title">管理我的账号</view>

+ 1 - 1
view/xcx/pages/user_money/index.js

@@ -74,7 +74,7 @@ Page({
         userInfo: res.data, 
         userInfo: res.data, 
         recharge_switch: res.data.recharge_switch
         recharge_switch: res.data.recharge_switch
       });
       });
-      app.updateUnread(res.data.notice.toString());
+      app.globalData.unread = res.data.notice
     });
     });
   },
   },
   /**
   /**

+ 1 - 1
view/xcx/pages/user_payment/index.js

@@ -106,7 +106,7 @@ Page({
     var that = this;
     var that = this;
     getUserInfo().then(res=>{
     getUserInfo().then(res=>{
       that.setData({ userinfo: res.data });
       that.setData({ userinfo: res.data });
-      app.updateUnread(res.data.notice.toString());
+      app.globalData.unread = res.data.notice
     })
     })
   },
   },
   /*
   /*

+ 1 - 1
view/xcx/pages/user_payment/index.wxml

@@ -1,5 +1,5 @@
 <navbar parameter='{{parameter}}'></navbar>
 <navbar parameter='{{parameter}}'></navbar>
-<form bindsubmit="submitSub" report-submit='true'>
+<form bindsubmit="submitSub">
    <view class="payment-top acea-row row-column row-center-wrapper">
    <view class="payment-top acea-row row-column row-center-wrapper">
       <text class='name'>我的余额</text>
       <text class='name'>我的余额</text>
       <view class='pic'>¥<text class='pic-font'>{{userinfo.now_money || 0}}</text></view>
       <view class='pic'>¥<text class='pic-font'>{{userinfo.now_money || 0}}</text></view>

+ 1 - 1
view/xcx/pages/user_sgin/index.wxml

@@ -24,7 +24,7 @@
          </view>
          </view>
       </view>
       </view>
       <button class='but bg-color on' wx:if="{{userInfo.is_day_sgin}}">已签到</button>
       <button class='but bg-color on' wx:if="{{userInfo.is_day_sgin}}">已签到</button>
-      <form bindsubmit="goSign" report-submit='true' wx:else>
+      <form bindsubmit="goSign" wx:else>
         <button class='but bg-color' formType="submit">立即签到</button>
         <button class='but bg-color' formType="submit">立即签到</button>
       </form>
       </form>
       <view class='lock'></view>
       <view class='lock'></view>

+ 1 - 1
view/xcx/pages/user_spread_user/index.js

@@ -67,7 +67,7 @@ Page({
     var that = this;
     var that = this;
     getUserInfo().then(res=>{
     getUserInfo().then(res=>{
       that.setData({ userInfo: res.data });
       that.setData({ userInfo: res.data });
-      app.updateUnread(res.data.notice.toString());
+      app.globalData.unread = res.data.notice
     });
     });
   },
   },
   /**
   /**