no message

app.json

@@ -15,18 +15,15 @@
     "pages/home/pinfo/index",
     "pages/home/qrcode/index",
     "pages/home/instructions/index",
-    "pages/home/share/index",
     "pages/shop/create/index",
     "pages/shop/detail/index",
     "pages/shop/order/index",
     "pages/shop/bidding/index",
     "pages/shop/bill/index",
-    "pages/shop/money/index",
     "pages/moment/paper/index",
     "pages/moment/create/index",
     "pages/moment/detail/index",
     "pages/moment/list/index",
-    "pages/moment/host-list/index",
     "pages/moment/host-info/index",
     "pages/moment/host-detail/index",
     "pages/article/publish/index",
@@ -43,7 +40,6 @@
     "pages/bidding/detail/index",
     "pages/mall/price-index/index",
     "pages/mall/detail/index",
-    "pages/mall/offer/index",
     "pages/mall/search/index",
     "pages/morder/index/index",
     "pages/morder/create/index",

pages/agent/agent-item/index.js

@@ -47,7 +47,11 @@ Component({
         this.setData({ ['item.cateIndex']: cateIndex })
       }
     },
-    saleGood: function(event){
+    saleGood: function(e){
+      if (!app.globalData.userInfo) {
+        wx.navigateTo({ url: '/pages/login/index' })
+        return
+      }
       if(util.isEmpty(this.data.item.cateIndex)){
         util.showToast('请选择一个纸品')
         return

pages/agent/factory/index.js

@@ -147,7 +147,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: this.data.factoryDetail.name + '废纸报价',
-      path: 'pages/login/index?url=/pages/agent/factory/index&key=id&value=' + this.data.factoryDetail.paperMillId
+      path: 'pages/index/index?url=/pages/agent/factory/index&key=id&value=' + this.data.factoryDetail.paperMillId
     }
   },
   toService: function(){

pages/article/detail/index.js

@@ -196,7 +196,7 @@ Page({
     }
     return {
       title: this.data.momentDetail.title,
-      path: 'pages/login/index?url=/pages/article/detail/index&key=id&value=' + this.data.momentDetail.id,
+      path: 'pages/index/index?url=/pages/article/detail/index&key=id&value=' + this.data.momentDetail.id,
       imageUrl: imageUrl
     }
   }

pages/home/about/index.js

@@ -13,54 +13,5 @@ Page({
    */
   onLoad: function (options) {
 
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
 })

pages/home/share/index.js

@@ -1,25 +0,0 @@
-// pages/home/share/index.js
-const request = require('../../../utils/request') //导入模块
-const util = require('../../../utils/util')
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    // cloud.init()
-  },
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})

pages/home/share/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/home/share/index.wxml

@@ -1,4 +0,0 @@
-<!--pages/home/share/index.wxml-->
-<cu-custom bgColor="bg-white" isBack="{{true}}">
-	<view slot="content">纸通宝二维码</view>
-</cu-custom>

pages/home/share/index.wxss

@@ -1 +0,0 @@
-/* pages/home/share/index.wxss */

pages/html/bankcard/index.js

@@ -1,66 +1,15 @@
 // pages/home/agreement/index.js
 Page({
-
   /**
    * 页面的初始数据
    */
   data: {
 
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
 
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
 })

pages/html/risk/index.js

@@ -1,66 +1,15 @@
 // pages/html/risk/index.js
 Page({
-
   /**
    * 页面的初始数据
    */
   data: {
 
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
 
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
 })

pages/index/index.js

@@ -12,7 +12,8 @@ Page({
     ],
     pageIndex: 1,
     safeBottom: app.globalData.safeBottom,
-    inited: false
+    inited: false,
+    path: null
   },
   /************************************** 初始化流程  ********************************************/
   onLoad: function (options) {
@@ -25,6 +26,12 @@ Page({
       // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
       updateManager.applyUpdate()
     })
+    if(options.url){
+      this.data.path = options.url
+      if(options.key && options.value){
+        this.data.path += '?' + options.key + '=' + options.value
+      }
+    }
   },
   onReady: function () {
     wx.showLoading({ title: '获取中', mask: true })
@@ -87,6 +94,9 @@ Page({
       app.globalData.userInfo = result.data
       wx.hideLoading()
       this.onResume()
+      if(this.data.path){
+        wx.navigateTo({ url: this.data.path })
+      }
     }).catch(err => {
       wx.hideLoading()
     })

pages/mall/detail/index.js

@@ -35,9 +35,7 @@ Page({
    */
   onLoad: function (options) {
     if (getCurrentPages().length == 1) {
-      this.setData({
-        backStr: '首页'
-      })
+      this.setData({ backStr: '首页' })
     }
     this.setData({ imageHeight: 750, kg: app.globalData.kg, safeBottom: app.globalData.safeBottom })
     event.on('EventMessage', this, this.onEvent)
@@ -207,6 +205,10 @@ Page({
   },
   // 进入支付流程
   offerProject: function (e) {
+    if (!app.globalData.userInfo) {
+      wx.navigateTo({ url: '/pages/login/index' })
+      return
+    }
     if (!app.globalData.userInfo.isVIP) {
       this.wuxDialog.open({
         resetOnClose: true,
@@ -216,9 +218,7 @@ Page({
           text: '确定',
           type: 'primary',
           onTap(e) {
-            wx.navigateTo({
-              url: '/pages/ztbvip/index'
-            })
+            wx.navigateTo({ url: '/pages/ztbvip/index' })
           }
         }]
       })
@@ -294,7 +294,7 @@ Page({
     }
     return {
       title: title,
-      path: 'pages/login/index?url=/pages/mall/detail/index&key=id&value=' + this.data.orderInfo.productId,
+      path: 'pages/index/index?url=/pages/mall/detail/index&key=id&value=' + this.data.orderInfo.productId,
       imageUrl: imgUrl,
       success: function (res) {}
     }
@@ -311,9 +311,7 @@ Page({
     if (!this.data.orderInfo) {
       return
     }
-    wx.navigateTo({
-      url: '/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId
-    })
+    util.navigateTo('/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId)
   },
   biddingPrice: function (price) {
     if(util.isEmpty(price)){

pages/mall/offer/index.js

@@ -1,66 +0,0 @@
-// pages/mall/offer/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})

pages/mall/offer/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/mall/offer/index.wxml

@@ -1,2 +0,0 @@
-<!--pages/mall/offer/index.wxml-->
-<text>pages/mall/offer/index.wxml</text>

pages/mall/offer/index.wxss

@@ -1 +0,0 @@
-/* pages/mall/offer/index.wxss */

pages/mall/search/index.js

@@ -1,66 +1,15 @@
 // pages/mall/search/index.js
 Page({
-
   /**
    * 页面的初始数据
    */
   data: {
 
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
 
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
 })

pages/message/detail/index.js

@@ -1,66 +1,15 @@
 // pages/message/detail/index.js
 Page({
-
   /**
    * 页面的初始数据
    */
   data: {
 
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
 
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
 })

pages/moment/detail/index.js

@@ -195,7 +195,7 @@ Page({
     }
     return {
       title: this.data.momentDetail.title,
-      path: 'pages/login/index?url=/pages/moment/detail/index&key=id&value=' + this.data.momentDetail.id,
+      path: 'pages/index/index?url=/pages/moment/detail/index&key=id&value=' + this.data.momentDetail.id,
       imageUrl: imageUrl
     }
   }

pages/moment/host-list/index.js

@@ -1,66 +0,0 @@
-// pages/moment/host-list/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})

pages/moment/host-list/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/moment/host-list/index.wxml

@@ -1,4 +0,0 @@
-<!--pages/moment/host-list/index.wxml-->
-<cu-custom bgColor="bg-white" isBack="{{true}}">
-	<view slot="content">纸吧列表</view>
-</cu-custom>

pages/moment/host-list/index.wxss

@@ -1 +0,0 @@
-/* pages/moment/host-list/index.wxss */

pages/purchase/detail/index.js

@@ -117,7 +117,7 @@ Page({
     }
     return {
       title: title,
-      path: 'pages/login/index?url=/pages/purchase/detail/index&key=id&value=' + this.data.orderInfo.productId,
+      path: 'pages/index/index?url=/pages/purchase/detail/index&key=id&value=' + this.data.orderInfo.productId,
       imageUrl: imageUrl,
       success: function (res) {}
     }

pages/shop/money/index.js

@@ -1,66 +0,0 @@
-// pages/shop/money/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})

pages/shop/money/index.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "wux-divider": "/components/divider/index",
-    "wux-cell": "/components/cell/index"
-  }
-}

pages/shop/money/index.wxml

@@ -1,43 +0,0 @@
-<!--pages/shop/money/index.wxml-->
-<cu-custom bgColor="bg-white" isBack="{{true}}">
-	<view slot="content">资金管理</view>
-</cu-custom>
-
-<view class="bg-white mt-15 padding">
-	<view class="text-center" style="margin-top:40rpx">
-		<view class="label">账户余额(元)</view>
-	</view>
-	<view class="text-center mt-15" style="font-size:75rpx">
-		<view class="money">￥6000.66</view>
-	</view>
-</view>
-<wux-divider show-text="{{ false }}"></wux-divider>
-<view class="flex bg-white">
-	<view class="mt-15 padding" style="flex:1">
-		<view class="text-center">
-			<view class="label">保证金(元)</view>
-		</view>
-		<view class="text-center mt-15" style="font-size:32rpx">
-			<view class="money">￥6000.66</view>
-		</view>
-	</view>
-	<view class="mt-15 padding" style="flex:1;border-left:1rpx solid #eee">
-		<view class="text-center">
-			<view class="label">未结算金额(元)</view>
-		</view>
-		<view class="text-center mt-15" style="font-size:32rpx">
-			<view class="money">￥6000.66</view>
-		</view>
-	</view>
-</view>
-<view style="height:24rpx"></view>
-<view class="bg-white">
-	<wux-cell-group>
-		<wux-cell title="充值" is-link url="/pages/shop/index/index">
-			<image slot="header" style="width:32rpx;height:32rpx;margin:12rpx 12rpx 0rpx 0rpx" src="/assets/image/icon_bank.png"></image>
-		</wux-cell>
-		<wux-cell title="提现" is-link url="/pages/bank/index/index">
-			<image slot="header" style="width:32rpx;height:32rpx;margin:12rpx 12rpx 0rpx 0rpx" src="/assets/image/icon_bank.png"></image>
-		</wux-cell>
-	</wux-cell-group>
-</view>

pages/shop/money/index.wxss

@@ -1 +0,0 @@
-/* pages/shop/money/index.wxss */

pages/ztbvip/index.js

@@ -56,7 +56,7 @@ Page({
     })
   },
   toAuthor: function(){
-    if(!this.data.userInfo.isAuth){
+    if(this.data.userInfo && !this.data.userInfo.isAuth){
       util.navigateTo('/pages/home/idcard/index')
     }
   },
@@ -65,11 +65,13 @@ Page({
    */
   onGridTap:function(e){
     var divIndexId=e.currentTarget.dataset.index
-    this.setData({
-      divIndex:this.data.iconList[divIndexId].id
-    })   
+    this.setData({ divIndex:this.data.iconList[divIndexId].id })   
   },
   openVip:function(){
+    if(!app.globalData.userInfo){
+      wx.navigateTo({ url: '/pages/login/index' })
+      return
+    }
     if(!app.globalData.userInfo.isAuth){
       this.wuxDialog.open({
         resetOnClose: true,
@@ -79,7 +81,7 @@ Page({
           text: '确定',
           type: 'primary',
           onTap(e) {
-            wx.navigateTo({ url: '/pages/home/idcard/index' })
+            util.navigateTo('/pages/home/idcard/index')
           }
         }]
       })

pages/ztbvip/index.wxml

@@ -5,7 +5,7 @@
 </cu-custom>
 <wux-image width="{{750}}" height="{{270}}" nuit="{{'rpx'}}" src="https://pic.downk.cc/item/5f181ed214195aa594565927.png" mode="aspectFill"></wux-image>
 <view style="padding:18rpx 24rpx;background-color:white">
-	<view class="header-box" wx:if="{{userInfo}}">
+	<view class="header-box">
 		<view class="flex">
 			<wux-image width="{{60}}" height="{{60}}" wux-class="image" shape="circle" src="{{avatarUrl}}" />
 			<view class="flex flex-column flex-center" style="width:100%;margin-left:18rpx;align-items:flex-start">
@@ -15,7 +15,7 @@
 						<view class="flex flex-center" style="font-size:12px" catchtap="toAuthor">
 							<image class="img-auth2" src="{{userInfo.isAuth == 1 ? '../../assets/image/icon_author.png' : '../../assets/image/icon_unauthor.png'}}"></image>
 							<text class="{{userInfo.isAuth == 1 ? 'text-blue' : 'text-gray'}}">{{userInfo.isAuth == 1 ? '已认证' : '未实名认证'}}</text>
-							<text class="text-yellow" style="padding:4px;" wx:if="{{userInfo.isAuth != 1}}">去认证</text>
+							<text class="text-yellow" style="padding:4px;" wx:if="{{userInfo && userInfo.isAuth != 1}}">去认证</text>
 						</view>
 					</view>
 					<button class="cu-btn bg-red round shadow-blur vip-btn" bindtap="openVip">{{vipInfo.isVIP==1?'立即续费':'开通会员'}}</button>

utils/util.js

@@ -184,7 +184,8 @@ const tokenList = [
   '/pages/html/integral/index',
   '/pages/withdrawal/balance/index',
   '/pages/agent/order/index',
-  '/pages/home/idcard/index'
+  '/pages/home/idcard/index',
+  '/pages/shop/detail/index'
 ]
 
 function navigateTo(url){