no message

app.json

@@ -18,6 +18,7 @@
     "pages/process/payment/index",
     "pages/htmls/agreement/index",
     "pages/htmls/auths/index",
+    "pages/htmls/banner/index",
     "pages/message/card-list/index",
     "pages/message/detail/index",
     "pages/storage/index/index",
@@ -28,6 +29,7 @@
     "pages/storage/order-info/index",
     "pages/storage/order-settlement/index",
     "pages/agent/agent-list/index",
+    "pages/agent/ability-list/index",
     "pages/agent/factory-detail/index",
     "pages/agent/order-list/index",
     "pages/agent/focus-list/index",

pages/agent/ability-list/index.js

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

pages/agent/ability-list/index.json

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

pages/agent/ability-list/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/agent/ability-list/index.wxml-->
+<text>pages/agent/ability-list/index.wxml</text>

pages/agent/ability-list/index.wxss

@@ -0,0 +1 @@
+/* pages/agent/ability-list/index.wxss */

pages/agent/factory-fragment/index.js

@@ -52,7 +52,7 @@ Component({
       this.data.firstShow = true
     },
     toAbility: function(){
-      wx.navigateTo({ url: '/pages/agent/ability/index' })
+      wx.navigateTo({ url: '/pages/agent/ability-list/index' })
     },
     fetchRegionList: function () {
       getFactoryCity().then(result => {
@@ -84,11 +84,7 @@ Component({
       if (this.data.requesting || this.data.finished) {
         return
       }
-      if (this.data.loading) {
-        this.data.requesting = true
-      } else {
-        this.setData({ requesting: true })
-      }
+      this.data.requesting = true
       getFactoryPrice(this.data.form).then(result => {
         if (result.data.records.length) {
           var respList = result.data.records

pages/agent/factory-fragment/index.json

@@ -6,6 +6,7 @@
     "refresh-view": "/components/refresh-view/index",
     "van-divider": "/components/divider/index",
     "van-loading": "/components/loading/index",
+    "van-image": "/components/image/index",
     "agent-item": "/pages/agent/agent-item/index"
   }
 }

pages/agent/factory-fragment/index.wxml

@@ -13,6 +13,13 @@
     <image class="img-empty" src="/assets/image/list_empty.png" wx:else></image>
     <view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
   </view>
+  <view wx:if="{{hasActivity && !loading && orderList.length}}" bindtap="toAbility">
+    <van-image width="750rpx" height="160rpx" src="https://img.imgdb.cn/item/603f4f7e360785be54c19c1d.png">
+      <view class="image-load" slot="loading">
+        <van-loading type="spinner" size="32" />
+      </view>
+    </van-image>
+  </view>
   <view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
     <view wx:for="{{pageItem}}" wx:key="index">
       <view style="height:16rpx" wx:if="{{pageIndex != 0 || index != 0 }}"></view>

pages/htmls/banner/index.js

@@ -0,0 +1,42 @@
+// pages/message/detail/index.js
+import Scene from '../../index/scene'
+const math = require('../../../utils/math')
+const app = getApp()
+
+Scene({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    fheight: app.globalData.fragmentHeight,
+    src: null,
+    height: 1200
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    if(!options.src){
+      wx.navigateBack()
+      return
+    }
+    wx.showLoading({ title: '处理中', mask: true })
+    this.setData({
+      fheight: app.globalData.fragmentHeight,
+      StatusBar: app.globalData.StatusBar || 40,
+      CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 60),
+      src: options.src
+    })
+  },
+  onImageLoad: function({detail}){
+    if(detail && detail.width){
+      var radio = math.divide(detail.width, 750)
+      var height = parseInt(math.divide(detail.height, radio))
+      this.setData({ height })
+    }
+    wx.hideLoading()
+  },
+  backPage() {
+    wx.navigateBack()
+  }
+})

pages/htmls/banner/index.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-image": "/components/image/index",
+    "van-loading": "/components/loading/index",
+    "notification": "/pages/message/notification/index"
+  }
+}

pages/htmls/banner/index.wxml

@@ -0,0 +1,14 @@
+<!--pages/message/detail/index.wxml-->
+<view class="cu-bar fixed" style="height:{{CustomBar}}px;padding-top:{{StatusBar}}rpx;border-bottom: 0rpx solid #eee">
+  <view class="action" bindtap="backPage">
+    <text class="weui_goback" style="color:white"></text>
+  </view>
+</view>
+
+<wux-image width="750rpx" height="{{height}}rpx" src="{{src}}" fit="fill" bind:load="onImageLoad">
+  <view class="flex flex-center" slot="loading" style="height:{{fheight}}rpx;width:750rpx">
+    <van-loading type="spinner" size="32" />
+  </view>
+</wux-image>
+
+<notification id="qn-notification"/>

pages/htmls/banner/index.wxss

@@ -0,0 +1 @@
+/* pages/message/detail/index.wxss */

utils/util.js

@@ -180,6 +180,34 @@ function combination(arr, m) {
   }
 }
 
+
+const tokenList = [
+   
+]
+
+function navigateTo(url){
+  var white = true
+  for (let index = 0; index < tokenList.length; index++) {
+    if(url.indexOf(tokenList[index]) == -1){
+      white = false
+      break
+    }
+  }
+  if(white && !app.userInfo){
+    wx.navigateTo({ url: '/pages/login/index' })
+    return
+  }
+  wx.navigateTo({ url })
+}
+
+function navigateTarget(redirectInfo){
+  if(redirectInfo.targetView == 'showImage'){
+    navigateTo('/pages/htmls/banner/index?src=' + redirectInfo.params.id)
+  } else if(redirectInfo.targetView == 'proxySellActivity'){
+    navigateTo('/pages/agent/ability-list/index')
+  }
+}
+
 module.exports = {
   isEmpty: isEmpty,
   extend: extend,
@@ -193,5 +221,7 @@ module.exports = {
   showBackToast: showBackToast,
   checkPhone: checkPhone,
   checkId: checkId,
-  combination: combination
+  combination: combination,
+  navigateTo: navigateTo,
+  navigateTarget: navigateTarget
 }