updating

view/xcx/api/api.js

@@ -13,6 +13,11 @@ export function getIndexData()
   return request.get("index",{},{ noAuth : true})
 }
 
+export function getNotifications()
+{
+  return request.get('notifications', {}, {noAuth: true})
+}
+
 /**
  * 获取登录授权login
  * 
@@ -191,8 +196,8 @@ export function getCity() {
   return request.get('city_list', {}, { noAuth: true })
 }
 
-export function getNotifications() {
-  return request.get('user/notifications', {}, { noAuth: true })
+export function getUserNotifications() {
+  return request.get('user/notifications', {})
 }
 
 // 获取排行榜

view/xcx/api/message.js

@@ -14,13 +14,13 @@ export function getMessages(page, limit = 20) {
 /**
  * 已读/未读 标记 0 未读 1已读
 */
-export function readMessage(ids, state) {
-  return request.post("user/messages", {ids: ids, read: state});
+export function readMessages(ids) {
+  return request.post("user/messages", {ids: ids, read: 1});
 }
 
 /**
  * 删除
 */
-export function delMessage(ids) {
+export function delMessages(ids) {
   return request.delete("user/messages", {ids: ids});
 }

view/xcx/api/mine.js

@@ -4,30 +4,33 @@ import request from "./../utils/request.js";
  * 
 */
 
+export function getMineStatus() {
+  return request.get('coin/status', {})
+}
 /**
  * 启动
 */
 export function bootCoin() {
-  request.post("coin/boot");
+  return request.post("coin/boot");
 }
 
 /**
  * 历史记录
 */
 export function coinHistory(page = 1, limit = 30) {
-  request.get("coin/history?page=" + page + "&limit=" + limit);
+  return request.get("coin/history?page=" + page + "&limit=" + limit);
 }
 
 /**
  * 更新钱包地址
 */
 export function coinAddress(address, symbol = "doge") {
-  request.post("coin/addr", { symbol: symbol, addr: address });
+  return request.post("coin/addr", { symbol: symbol, addr: address });
 }
 
 /**
  * 提币
 */
 export function coinTransfer(amount, symbol = "doge") {
-  request.post("coin/transfer", { symbol: symbol, amount: amount });
-}
+  return request.post("coin/transfer", { symbol: symbol, amount: amount });
+}

view/xcx/app.js

@@ -94,7 +94,6 @@ App({
     userInfo:{},
     loginType:'routine',
     isFixed: false,
-    unread: 0,    // 未读消息条数
   },
   /**
    * 聊天事件快捷注册
@@ -118,6 +117,25 @@ App({
   {
     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,
+      });
+    }
+  },
+  
   /*
   * 合并数组
   * @param array list 请求返回数据
@@ -125,4 +143,20 @@ App({
   * @return array
   */
   SplitArray: function (list, sp) { return util.SplitArray(list, sp)},
+
+  tsToString: function (ts) {
+    var date = new Date(ts * 1000);
+    var y = date.getFullYear();
+    var m = date.getMonth() + 1;
+    m = m < 10 ? ('0' + m) : m;
+    var d = date.getDate();
+    d = d < 10 ? ('0' + d) : d;
+    var h = date.getHours();
+    h=h < 10 ? ('0' + h) : h;
+    var minute = date.getMinutes();
+    minute = minute < 10 ? ('0' + minute) : minute;
+    var second=date.getSeconds();
+    second=second < 10 ? ('0' + second) : second;
+    return y + '-' + m + '-' + d+' '+h+':'+minute+':'+second; 
+  },
 })

view/xcx/components/mine/index.js

@@ -1,6 +1,5 @@
 // components/mine/index.js
-import { bootCoin } from "../../api/mine"
-import { getNotifications } from "../../api/api"
+import { getMineStatus, bootCoin } from "../../api/mine"
 import { formatTime } from "../../utils/util"
 
 Component({
@@ -46,7 +45,7 @@ Component({
    */
   methods: {
     tabIn: function() {
-      this.getNotification();
+      this.getStatus();
       this.starTimer();
 
       console.log(formatTime(new Date(1620633003000)));
@@ -58,9 +57,9 @@ Component({
       clearTimeout(this.data.coinTimer);
     },
 
-    getNotification: function() {
+    getStatus: function() {
       var that = this;
-      getNotifications().then(res=>{
+      getMineStatus().then(res=>{
         console.log(res);
         that.setData({
 
@@ -74,7 +73,7 @@ Component({
       });
 
       that.data.coinTimer = setTimeout(()=>{
-        that.getNotification();
+        that.getStatus();
       }, 30000);
     },
 

view/xcx/pages/activity/goods_bargain/index.wxml

@@ -16,4 +16,4 @@
       </block>      
    </view>
 </view>
-<home></home>
+<!-- <home></home> -->

view/xcx/pages/activity/goods_bargain_details/index.wxml

@@ -118,4 +118,4 @@
 </view>
 <authorize bind:onLoadFun="onLoadFun"></authorize>
 <import src="/wxParse/wxParse.wxml"/>
-<home></home>
+<!-- <home></home> -->

view/xcx/pages/activity/goods_combination_details/index.wxml

@@ -137,4 +137,4 @@
 ></product-window>
 <authorize bind:onLoadFun="onLoadFun"></authorize>
 <import src="/wxParse/wxParse.wxml"/>
-<home></home>
+<!-- <home></home> -->

view/xcx/pages/activity/goods_combination_status/index.wxml

@@ -94,4 +94,4 @@
   bind:goCat="goCat"
 ></product-window>
 <authorize bind:onLoadFun="onLoadFun"></authorize>
-<home></home>
+<!-- <home></home> -->

view/xcx/pages/activity/goods_seckill/index.wxml

@@ -68,7 +68,7 @@
 <view class='noCommodity' wx:if="{{seckillList.length == 0 && (page != 1 || active== 0)}}">
    <view class='pictrue'><image src='/images/noShopper.png'></image></view>
 </view>
-<home></home>
+<!-- <home></home> -->
 <!-- <view class='list'>
      <block wx:for="{{seckillList}}" wx:key='index'>
       <view class='item acea-row row-between-wrapper'>

view/xcx/pages/activity/goods_seckill_details/index.wxml

@@ -104,4 +104,4 @@
 <product-window iSplus="{{iSplus}}" limitNum="{{limitNum}}" attribute='{{attribute}}' productAttr="{{productAttr}}" productSelect="{{productSelect}}" bind:myevent="onMyEvent" bind:ChangeAttr="ChangeAttr" bind:ChangeCartNum="ChangeCartNum" id='product-window' bind:iptCartNum="iptCartNum" ></product-window>
 <import src="/wxParse/wxParse.wxml"/>
 <authorize bind:onLoadFun="onLoadFun"></authorize>
-<home></home>
+<!-- <home></home> -->

view/xcx/pages/goods_details/index.js

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

view/xcx/pages/goods_details/index.wxml

@@ -114,33 +114,33 @@
     </view>
     <userEvaluation reply="{{reply}}"></userEvaluation>
   </view>
-   <view class="superior" wx:if="{{good_list.length}}" id="past2">
-      <view class="title acea-row row-center-wrapper">
-        <image src="/images/ling.png"></image>
-        <view class="titleTxt">优品推荐</view>
-        <image src="/images/ling.png"></image>
-      </view>
-      <view class="slider-banner banner">
-        <swiper indicator-dots="true"
-            autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" indicator-color="#999" indicator-active-color="#e93323" style="height:{{clientHeight+'px'}}">
-          <swiper-item wx:for="{{good_list}}" wx:for-item='item' wx:for-index='indexw' wx:key='index'>
-            <view class="list acea-row row-middle" id="list{{indexw}}">
-              <view class="item" wx:for="{{item.list}}" wx:key='index' wx:for-item='val' bindtap="goDetail" data-items='{{val}}'>
-                  <view class="pictrue">
-                    <image src="{{val.image}}"></image>
-                     <text class="pictrue_log pictrue_log_class" wx:if="{{val.activity && val.activity.type ==='1'}}">秒杀</text>
-                    <text class="pictrue_log pictrue_log_class" wx:if="{{val.activity && val.activity.type === '2'}}">砍价</text>
-                    <text class="pictrue_log pictrue_log_class" wx:if="{{val.activity && val.activity.type === '3'}}">拼团</text>
-                  </view>
-                  <view class="name line1">{{val.store_name}}</view>
-                  <view class="money font-color">¥{{val.price}}</view>
+  <view class="superior" wx:if="{{good_list.length}}" id="past2">
+    <view class="title acea-row row-center-wrapper">
+      <image src="/images/ling.png"></image>
+      <view class="titleTxt">优品推荐</view>
+      <image src="/images/ling.png"></image>
+    </view>
+    <view class="slider-banner banner">
+      <swiper indicator-dots="true"
+        autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" indicator-color="#999" indicator-active-color="#e93323" style="height:{{clientHeight+'px'}}">
+        <swiper-item wx:for="{{good_list}}" wx:for-item='item' wx:for-index='indexw' wx:key='index'>
+          <view class="list acea-row row-middle" id="list{{indexw}}">
+            <view class="item" wx:for="{{item.list}}" wx:key='index' wx:for-item='val' bindtap="goDetail" data-items='{{val}}'>
+              <view class="pictrue">
+                <image src="{{val.image}}"></image>
+                <text class="pictrue_log pictrue_log_class" wx:if="{{val.activity && val.activity.type ==='1'}}">秒杀</text>
+                <text class="pictrue_log pictrue_log_class" wx:if="{{val.activity && val.activity.type === '2'}}">砍价</text>
+                <text class="pictrue_log pictrue_log_class" wx:if="{{val.activity && val.activity.type === '3'}}">拼团</text>
               </view>
+              <view class="name line1">{{val.store_name}}</view>
+              <view class="money font-color">¥{{val.price}}</view>
             </view>
-          </swiper-item>
-          <view class="swiper-pagination" slot="pagination"></view>
-        </swiper>
-      </view>
+          </view>
+        </swiper-item>
+        <view class="swiper-pagination" slot="pagination"></view>
+      </swiper>
     </view>
+  </view>
   <view class='product-intro' id="past3">
     <view class='title'>产品介绍</view>
     <view class='conter'>

view/xcx/pages/goods_details/index.wxss

@@ -17,9 +17,9 @@
 padding:2rpx 8rpx 3rpx;border-radius:200rpx;top:-10rpx;right:-10rpx;}
 .product-con .footer .bnt{width:444rpx;height:76rpx;}
 .product-con .footer .bnt .bnts{width:142rpx;text-align:center;line-height:76rpx;color:#fff;font-size:25rpx;}
-.product-con .footer .bnt .joinCart{border-radius:50rpx 0 0 50rpx;background-image: linear-gradient(to right,#fea10f 0%,#fa8013 100%);}
-.product-con .footer .bnt .buy{border-radius:0 50rpx 50rpx 0;background-image: linear-gradient(to right,#fa6514 0%,#e93323 100%);}
-.product-con .footer .bnt .share{border-radius:50rpx 50rpx 50rpx 50rpx;background-image: linear-gradient(to right,#fa6514 0%,#e93323 100%); margin-left: 6rpx;}
+.product-con .footer .bnt .joinCart{border-radius:50rpx 0 0 50rpx;background-image: linear-gradient(to right,#000 0%,#000 100%);}
+.product-con .footer .bnt .buy{border-radius:0 50rpx 50rpx 0;background-image: linear-gradient(to right,#e93323 0%,#f00 100%);}
+.product-con .footer .bnt .share{border-radius:50rpx 50rpx 50rpx 50rpx;background-image: linear-gradient(to right,#e93323 0%,#f00 100%); margin-left: 6rpx;}
 .product-con .store-info {margin-top:20rpx;background-color: #fff;}
 .product-con .store-info .title {font-size: 28rpx;color: #282828;
   height: 80rpx;line-height: 80rpx;}

view/xcx/pages/index/index.js

@@ -1,6 +1,6 @@
 const app = getApp();
 import wxh from '../../utils/wxh.js';
-import { getIndexData, getCoupons, getTemlIds, getLiveList, getNotifications } from '../../api/api.js';
+import { getIndexData, getCoupons, getTemlIds, getLiveList } from '../../api/api.js';
 import { CACHE_SUBSCRIBE_MESSAGE } from '../../config.js';
 import { getCategoryList, getProductHot, getProductslist } from '../../api/store.js';
 import { getCouponReceive} from '../../api/user.js';
@@ -98,7 +98,6 @@ Page({
     wxh.selfLocation(1);
     this.getCategoryData();
     // this.getCoupon();
-    this.getNotification();
     this.get_host_product();
     this.get_product_list();
     this.setData({
@@ -154,7 +153,6 @@ Page({
   onShow: function () {
     // this.getCoupon();
     this.getIndexConfig();
-    this.getNotification();
     // this.getSeckillTime();
   },
 
@@ -173,7 +171,6 @@ Page({
         logoUrl: res.data.logoUrl,
         couponList: res.data.couponList,
       });
-      console.log(res.data)
       // 检测是否授权；scope.userInfo存在为授权；
       wx.getSetting({
         success(res) {
@@ -392,26 +389,6 @@ Page({
     });
   },
 
-  /** 更新消息红字 */
-  getNotification: function() {
-    var that = this;
-    getNotifications().then(res=>{
-      var unread = res.data.unread;
-      if(unread > 0) {
-        wx.setTabBarBadge({
-          index: 2,
-          text: res.data.unread.toString()
-        });
-      } else {
-        wx.removeTabBarBadge({
-          index: 2,
-        });
-      }
-    }).catch(err=>{
-
-    });
-  },
-
   receiveCoupon: function (e) {
     if (!app.globalData.isLog) {
       this.setData({

view/xcx/pages/leader_board/index.js

@@ -18,12 +18,14 @@ Page({
   onLoad: function (options) {
     var that = this
     getLeaderBoard().then(res => {
-      that.setData({
-        banner: res.data.banner,
-        name: res.data.name,
-        board: res.data.board,
-      })
-      console.log(res.data)
+      if (res.data) {
+        that.setData({
+          banner: res.data.banner,
+          name: res.data.name,
+          board: res.data.board,
+        })
+        console.log(res.data)
+      }
     },
     err => {
       console.log(err)

view/xcx/pages/message/index.js

@@ -1,7 +1,6 @@
 // pages/message/index.js
 import { getProductHot } from '../../api/store.js';
-import { getMessages } from "../../api/message"
-import { SplitArray } from "../../utils/util"
+import { getMessages, readMessages } from "../../api/message"
 var base64 = require("../../utils/base64")
 
 const app = getApp();
@@ -21,6 +20,7 @@ Page({
     host_product:[],
     iShidden: false,
     page: 0,
+    unread: 0,
     messages: []
   },
 
@@ -28,11 +28,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    wx.setTabBarBadge({
-      index: 2,
-      text: '9'
-    });
-    console.log("load");
     if (app.globalData.token) this.setData({ iShidden:true});
   },
 
@@ -45,7 +40,6 @@ Page({
   onLoadFun: function() {
     this.pullMessageList();
     this.get_host_product();
-    this.refreshNotifications();
   },
 
   /**
@@ -62,15 +56,6 @@ Page({
     }
   },
 
-  refreshNotifications: function() {
-    var that = this;
-    getNotifications().then(res=>{
-      console.log(res);
-    }, err=> {
-      console.log(err);
-    });
-  },
-
   /**
    * 获取我的推荐
   */
@@ -91,55 +76,43 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-    console.log("unload");
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-    var that = this;
-    wx.stopPullDownRefresh({
-      success: (res) => {
-        setTimeout(function() {
-          console.log("success stop")
-          that.data.page = 1;
-          that.pullMessageList();
-        }, 300);
-      },
-    });
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    console.log("load more");
-    this.data.page ++;
-    this.pullMessageList();
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   },
 
   pullMessageList() {
     var that = this;
     getMessages(that.data.page).then(res=>{
+      var unread = 0;
+      res.data.forEach(function(row){
+        row.ts = app.tsToString(row.ts)
+        row.read = row.read == null ? false : true
+        if (!row.read){
+          unread += 1
+        }
+      })
+      app.updateUnread(unread)
+
       that.setData({
-        messages: SplitArray(that.data.messages, res.messages)
+        messages: res.data,
+        unread: unread
       });
     }, err=> {
 
     });
   },
 
-  tabClick(e) {
+  onTapMessageItem(e) {
+    if (!e.currentTarget.dataset.items.read) {
+      var that = this
+      readMessages([e.currentTarget.dataset.items.id]).then(res=>{
+        that.setData({
+          unread: that.data.unread-1,
+        })
+        app.updateUnread(that.data.unread)
+      })
+      
+    }
     wx.navigateTo({
-      url: '/pages/message_details/index?data=' + base64.encode(JSON.stringify(e.currentTarget.dataset.items)),
+      url: '/pages/message_details/index?data=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.items)),
     });
   }
 })

view/xcx/pages/message/index.wxml

@@ -7,16 +7,16 @@
     <recommend host_product="{{host_product}}"></recommend>
   </view>
   <view class="list" wx:else>
-    <view class="item" wx:for="{{messages}}" wx:key="index" bindtap="tabClick" data-items='{{item}}'>
+    <view class="item" wx:for="{{messages}}" wx:key="index" bindtap="onTapMessageItem" data-items='{{item}}'>
       <view class="icon">
         <image src="{{item.icon}}"></image>
       </view>
       <view class="content">
+        <view class="title">{{item.subject}}</view>
         <view class="header">
-          <view class="from">{{item.from}}</view>
-          <view class="time">{{item.ts}}</view>
+          <view class="from">来自 {{item.from}}</view>
+          <view class="time">{{ item.ts }}</view>
         </view>
-        <view class="title">{{item.subject}}</view>
       </view>
     </view>
   </view>

view/xcx/pages/message/index.wxss

@@ -7,7 +7,7 @@
 .message .list .item .icon { width: 104rpx; height: 104rpx; }
 .message .list .item .icon image { width: 100%; height: 100%; }
 .message .list .item .content { margin-left: 20rpx; width: 82%; }
-.message .list .item .content .header {display: flex; }
-.message .list .item .content .header .from { font-size: 32rpx; width: 50%; text-align: left; }
+.message .list .item .content .header {display: flex; margin: 20rpx 0;}
+.message .list .item .content .title { font-size: 32rpx; width: 50%; text-align: left; }
 .message .list .item .content .header .time { font-size: 28rpx; color: #a1a1a1; width: 50%; text-align: right; margin-right: 20rpx; }
-.message .list .item .content .title { font-size: 28rpx; color: #a1a1a1; text-align: left; line-height: 60rpx; }
+.message .list .item .content .header .from { font-size: 28rpx; color: #a1a1a1; text-align: left; }

view/xcx/pages/message_details/index.js

@@ -19,7 +19,9 @@ Page({
     title: "",
     from: "",
     date: "",
+    type: 1,
     content: "",
+    read: 0,
     fixed: false,
   },
 
@@ -27,7 +29,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    var data = JSON.parse(base64.decode(options.data));
+    var data = JSON.parse(decodeURIComponent(options.data));
     var params = this.data.parameter;
     params.title = data.subject;
     this.setData({
@@ -35,7 +37,9 @@ Page({
       title: data.subject,
       from: data.from,
       date: data.ts,
+      type: data.type,
       content: data.body,
+      read: data.read,
       parameter: params,
       fixed: app.globalData.isFixed,
     });
@@ -52,7 +56,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
   },
 
   /**
@@ -69,28 +72,7 @@ Page({
 
   },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-
-  delClick: function() {
+  onClickedDelete: function() {
 
   }
 })

view/xcx/pages/message_details/index.wxml

@@ -2,13 +2,13 @@
 <view class="message_details">
   <!-- <view class="title">{{title}}</view> -->
   <view class="header">
-    <view class="from">{{from}}</view>
+    <view class="from">来自:{{from}}</view>
     <view class="date">{{date}}</view>
   </view>
   <view class="content">
     <rich-text nodes="{{content}}"></rich-text>
   </view>
-  <view class="bottom {{ fixed ? 'fixed' : ''}}">
-    <button bindtap="delClick">删除消息</button>
+  <view class="bottom {{ fixed ? 'fixed' : ''}}" wx:if="{{type == 2}}">
+    <button bindtap="onClickedDelete">删除消息</button>
   </view>
 </view>

view/xcx/pages/news_details/index.wxml

@@ -22,4 +22,4 @@
     <button class="bnt bg-color" open-type="share"  hover-class='none'>和好友一起分享</button>
 </view>
 <import src="/wxParse/wxParse.wxml"/>
-<home></home>
+<!-- <home></home> -->

view/xcx/pages/news_list/index.wxml

@@ -55,4 +55,4 @@
 <view class='noCommodity' wx:if="{{articleList.length == 0 && (page != 1 || active== 0)}}">
    <view class='pictrue'><image src='/images/noNews.png'></image></view>
 </view>
-<home></home>
+<!-- <home></home> -->

view/xcx/pages/order_confirm/index.wxml

@@ -124,4 +124,4 @@
 <coupon-list-window coupon='{{coupon}}' bind:ChangCouponsClone="ChangCouponsClone" openType='{{openType}}' cartId='{{cartId}}'bind:ChangCoupons="ChangCoupons"></coupon-list-window>
 <address-window bind:changeTextareaStatus="changeTextareaStatus" address='{{address}}' pagesUrl="{{pagesUrl}}" id="address-window" bind:OnChangeAddress="OnChangeAddress"></address-window>
 <authorize bind:onLoadFun='onLoadFun'></authorize>
-<home></home>
+<!-- <home></home> -->

view/xcx/pages/order_details/index.js

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

view/xcx/pages/order_details/index.wxml

@@ -175,7 +175,7 @@
       <view class='bnt bg-color' wx:if="{{status.class_status==5}}" bindtap='goOrderConfirm'>再次购买</view>
    </view>
 </view>
-<home></home>
+<!-- <home></home> -->
 <authorize bind:onLoadFun='onLoadFun'></authorize>
 <payment payMode='{{payMode}}' pay_close="{{pay_close}}" bind:onChangeFun='onChangeFun' order_id="{{pay_order_id}}" totalPrice='{{totalPrice}}'></payment>
 <generalWindow 

view/xcx/pages/order_list/index.js

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

view/xcx/pages/order_list/index.wxml

@@ -88,5 +88,5 @@
   </view>
 </view>
 <authorize bind:onLoadFun='onLoadFun'></authorize>
-<home></home>
+<!-- <home></home> -->
 <payment payMode='{{payMode}}' pay_close="{{pay_close}}" bind:onChangeFun='onChangeFun' order_id="{{pay_order_id}}" totalPrice='{{totalPrice}}'></payment>

view/xcx/pages/user/user.js

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

view/xcx/pages/user_cash/index.js

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

view/xcx/pages/user_info/index.js

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

view/xcx/pages/user_money/index.js

@@ -60,6 +60,10 @@ Page({
     });
   },
 
+  // 点击币
+  onTapCoinItem: function() {
+
+  },
   /**
    * 获取用户详情
   */
@@ -70,6 +74,7 @@ Page({
         userInfo: res.data, 
         recharge_switch: res.data.recharge_switch
       });
+      app.updateUnread(res.data.notice.toString());
     });
   },
   /**

view/xcx/pages/user_money/index.wxml

@@ -59,16 +59,20 @@
     </view>
     -->
     <view class="list">
-      <view class='item acea-row row-between-wrapper'>
+      <view class='item acea-row row-between-wrapper'wx:for="{{userInfo.coins}}" bindtap='onTapCoinItem' data-index='{{index}}' data-id="{{item.id}}" wx:key='index'>
         <view class='picTxt acea-row row-between-wrapper'>
-          <view class='iconfont icon-hebingxingzhuang'>
-          </view>
+          <image class="iconfont" src="{{ item.icon }}"></image>
           <view class='text'>
-            <view class='line1'>BTC</view>
+            <view class='line1'>{{ item.symbol }}</view>
+            <view >数量 {{ item.total }}</view>
           </view>
       	</view>
+        <!--
+        <navigator hover-class='none' url='/pages/activity/goods_combination/index' class='bnt'>详情</navigator>
+       
         <navigator hover-class='none' url='/pages/activity/goods_combination/index' class='bnt' wx:if="{{activity.is_pink}}">立即参与</navigator>
         <view class='bnt end' wx:else>已结束</view>
+        -->
       </view>
     </view>
     <!--

view/xcx/pages/user_money/index.wxss

@@ -29,4 +29,10 @@
 .my-account .wrapper .list .item .picTxt .text .infor{font-size:24rpx;color:#999;margin-top:5rpx;}
 .my-account .wrapper .list .item .bnt{font-size:26rpx;color:#282828;width:156rpx;height:52rpx;border:1rpx solid #ddd;border-radius:26rpx;text-align:center;line-height:52rpx;}
 .my-account .wrapper .list .item .bnt.end{font-size:26rpx;color:#aaa;background-color:#f2f2f2;
-border-color:#f2f2f2;}
+border-color:#f2f2f2;}
+
+.my-account .wrapper .list .item .picTxt .picTxt .item-icon {
+  width: 30rpx;
+  height: 30rpx;
+  border-radius: 50%;
+}

view/xcx/pages/user_payment/index.js

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

view/xcx/pages/user_return_list/index.wxml

@@ -24,5 +24,5 @@
      </view>
 
 <authorize bind:onLoadFun="onLoadFun"></authorize>
-<home></home>
+<!-- <home></home> -->
 

view/xcx/pages/user_spread_user/index.js

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