202125

app.js

@@ -1,7 +1,7 @@
  //app.js
 App({
    //----------------------------------------------globalData--------------------------------------
-   evn: 2,//0:开发环境，1：测试环境，2：生产环境
+   evn: 0,//0:开发环境，1：测试环境，2：生产环境
    tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
    agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
    version: 152,

app.json

@@ -31,6 +31,9 @@
     "pages/article/price-detail/index",
     "pages/article/queue-detail/index",
     "pages/article/factory/index",
+    "pages/article/newInfo/index",
+    "pages/article/allNewInfo/index",
+    "pages/article/feedback/index",
     "pages/article/list/index",
     "pages/goods/ablility/index",
     "pages/goods/index/index",

pages/api/ztb.js

@@ -127,6 +127,9 @@ const updateUserInfo = (params) => mPost(`/recycle-service/user/update/user-info
 const updateUserInfoZtb = (params) => mPost(`/recycle-service/user/update/user-info`, params, zconfig)
 //用户关注，取消关注纸厂
 const userPushFollowMill = (params) => mPost(`/recycle-service/user/push/follow-mill`, params, zconfig)
+//用户在情报中获取纸厂
+const getPaperMillOfInformationList = (params) => mGet(`/recycle-service/get/paper-mill-of-information-list`, params, zconfig)
+
 
 
 export {
@@ -222,5 +225,6 @@ export {
   getLategoriesList,
   updateUserInfo,
   updateUserInfoZtb,
-  userPushFollowMill
+  userPushFollowMill,
+  getPaperMillOfInformationList
 }

pages/article/allNewInfo/index.js

@@ -0,0 +1,63 @@
+const util = require('../../../utils/util')
+const app = getApp()
+import {
+  getPaperMillOfInformationList
+} from "../../api/ztb"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    height: app.globalData.safeFragmentHeight - 190,
+    safeBottom: app.globalData.safeBottom,
+    orderList: [],
+    tableSgin: null,
+    loading: false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      StatusBar: app.globalData.StatusBar || 40,
+      CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80),
+    })
+    this.getPaperMillOfInformationListFct({
+      queryWay: 1
+    })
+
+  },
+  toPage: function (e) {
+    if (e.currentTarget.id == 'toqb') {
+      util.navigateTo('/pages/article/index/index')
+    }
+  },
+  changeTable: function (e) {
+    var a = e.currentTarget.id
+    if (e.currentTarget.id === this.data.tableSgin) {
+      this.setData({
+        tableSgin: null
+      })
+    } else {
+      this.setData({
+        tableSgin: e.currentTarget.id
+      })
+    }
+  },
+  getPaperMillOfInformationListFct(model) {
+    this.setData({
+      loading: true
+    })
+    getPaperMillOfInformationList(model).then(res => {
+      this.setData({
+        orderList: res.data
+      })
+      this.setData({
+        loading: false
+      })
+    })
+  },
+})

pages/article/allNewInfo/index.json

@@ -0,0 +1,12 @@
+{
+  "component": true,
+  "usingComponents": {
+    "wux-tabi": "/components/tabi/index",
+    "hot": "/pages/article/hot-index/index",
+    "price": "/pages/article/price-index/index",
+    "queue": "/pages/article/queue-index/index",
+    "point": "/pages/article/point-index/index",
+    "wux-accordion-group": "/components/accordion-group/index",
+    "wux-accordion": "/components/accordion/index"
+  }
+}

pages/article/allNewInfo/index.wxml

@@ -0,0 +1,63 @@
+<!--pages/main/index.wxml-->
+<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
+<cu-custom bgColor="bg-white" isBack="{{true}}">
+	<view slot="content">全部纸厂</view>
+</cu-custom>
+	<view style="width:100%;height:60rpx;" class="topTitle">
+		<view class="topLeft">
+			<view class="topLeftText">纸厂情报</view>
+			<view class="topLeftTime">2021-01-04</view>
+		</view>
+		<view class="topRight">
+			<view class="topRightText">全部纸厂></view>
+			<view class="topRightIcon">Icon</view>
+		</view>
+	</view>
+<view style="width:100%;height:15rpx;"></view>
+<view class="zt">
+	<view class="flex flex-justify" style="">
+		<view class="text-df text-gray" style="flex:1.5">纸厂名称</view>
+		<view class="text-df text-gray" style="flex:1;text-align: center">价格涨跌</view>
+		<view class="text-df text-gray" style="flex:1;text-align: center">纸厂排队</view>
+		<view class="text-df text-gray" style="flex:1;text-align: center">最近扣点</view>
+		<view class="text-df text-gray" style="flex:0.5;text-align: center">更多</view>
+	</view>
+	<scroll-view scroll-y="true" style='width:100%;margin-top:10rpx;background-color:white'>
+		<view class="bg-white list-empty" style="height:{{height}}rpx" wx:if="{{!orderList.length}}">
+			<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
+			<image class="img-empty" src="/assets/image/list_empty.png" wx:else></image>
+			<view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
+		</view>
+		<!-- <view class="bg-white" wx:else> -->
+		<view class="bg-white">
+			<view wx:for="{{orderList}}" wx:key="index">
+				<view class="flex flex-justify" style="border-top:2rpx solid #f3f3f3;margin-top:20rpx">
+					<!-- <text class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayTotalQuantity || 0}}%</text> -->
+					<view class="text-df text-balck" style="flex:1.5">{{item.name}}</view>
+					<view class="text-df {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{item.biggestFloatPrice||0}}</view>
+					<view class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayRetainedQuantity || 0}}辆</view>
+					<view class="text-df text-balck" style="flex:1;text-align: center">{{item.minimumDeductionPoint || 0}}%</view>
+					<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillid}}" bindtap="changeTable"><image style="width:28rpx;height:28rpx;" src="/assets/info/factoryDown.png"></image></view>
+				</view>
+				<view wx:if="{{tableSgin==item.paperMillid}}" style="width:100%;background-color:#f3f3f3;padding:10rpx">
+					<view class="flex flex-justify" style="">
+						<view class="text-df text-gray" style="flex:1;text-align: center">品类</view>
+						<view class="text-df text-gray" style="flex:1;text-align: center">价格</view>
+						<view class="text-df text-gray" style="flex:1;text-align: center">涨跌</view>
+						<view class="text-df text-gray" style="flex:1;text-align: center">最近扣点</view>
+						<view class="text-df text-gray" style="flex:1;text-align: center">操作</view>
+					</view>
+					<view class="flex flex-justify" style="margin-top:20rpx" wx:for="{{ item.paperCategoryList }}" wx:for-item="cell" wx:key="cell.categoryId">
+						<view class="text-df {{cell.categoryName>0?'text-red':(cell.categoryName<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{cell.categoryName|| '---'}}</view>
+						<view class="text-df {{cell.unitPrice>0?'text-red':(cell.unitPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.unitPrice|| 0}}</view>
+						<view class="text-df {{cell.floatPrice>0?'text-red':(cell.floatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.floatPrice|| 0}}</view>
+						<view class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view>
+						<view class="text-df text-balck" style="flex:1;text-align: center">我要代卖</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</scroll-view>
+</view>
+
+

pages/article/allNewInfo/index.wxss

@@ -0,0 +1,108 @@
+/* pages/main/index.wxss */
+page {
+  background-color: white;
+}
+
+.booking-tool {
+  width: calc(100% - 20px);
+  background-color: #008AFF;
+  position: fixed;
+  left: 25px;
+}
+
+.roder-add {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100rpx;
+  height: 100rpx;
+  background-color: #008AFF;
+  border-radius: 50rpx;
+  position: absolute;
+  top: 24px;
+  right: 24px;
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+}
+
+.boderLine {
+  width: 100%;
+  height: 50rpx;
+  background-color: #f3f3f3;
+}
+
+.midTietle {
+  height: 100rpx;
+  width: 100%;
+  background-color: white;
+  display: flex;
+  justify-content: space-between;
+  padding: 0rpx 40rpx 0rpx 40rpx;
+}
+
+.midTietleText1 {
+  height: 100rpx;
+  line-height: 100rpx;
+}
+
+.zt {
+  padding: 0rpx 40rpx 0rpx 40rpx;
+  background-color: white;
+}
+
+.topTitle {
+  display: flex;
+  justify-content: space-between;
+}
+
+.topRight {
+  width: 50%;
+  height: 60rpx;
+}
+
+.topLeft {
+  width: 50%;
+  height: 60rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.topLeftText {
+  font-family: PingFangSC-Medium;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  height: 60rpx;
+  line-height: 60rpx;
+  padding-left: 32rpx;
+}
+
+.topLeftTime {
+  font-family: PingFangSC-Medium;
+  font-size: 28rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  height: 60rpx;
+  line-height: 60rpx;
+}
+
+.topRightText {
+  font-family: PingFangSC-Medium;
+  font-size: 28rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  height: 60rpx;
+  line-height: 60rpx;
+  float: right;
+  margin-right: 38.5rpx;
+}
+
+.topRightIcon {
+  font-family: PingFangSC-Medium;
+  font-size: 28rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  height: 60rpx;
+  line-height: 60rpx;
+  float: right;
+  margin-right: 36.3rpx;
+}

pages/article/feedback/index.js

@@ -0,0 +1,74 @@
+// pages/article/feedback/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    picker: ['喵喵喵', '汪汪汪', '哼唧哼唧'],
+    index: null,
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  PickerChange(e) {
+    console.log(e);
+    this.setData({
+      index: e.detail.value
+    })
+  },
+})

pages/article/feedback/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "picker-view": "/components/picker-view/index"
+  }
+}

pages/article/feedback/index.wxml

@@ -0,0 +1,35 @@
+<!--pages/article/feedback/index.wxml-->
+<cu-custom bgColor="bg-white" isBack="{{true}}">
+	<view slot="content">反馈情报</view>
+</cu-custom>
+<view class="zt">
+	<view class="view1">
+		<view class="cu-form-group margin-top">
+			<view class="title">反馈纸厂</view>
+			<picker bindchange="PickerChange" value="{{index}}" range="{{picker}}">
+				<view class="picker">
+					{{index?picker[index]:'禁止换行，超出容器部分会以 ... 方式截断'}}
+				</view>
+			</picker>
+		</view>
+	</view>
+	<view class="view2">
+		<view class="cu-form-group margin-top">
+			<view class="title">反馈类型</view>
+			<picker bindchange="PickerChange" value="{{index}}" range="{{picker}}">
+				<view class="picker">
+					{{index?picker[index]:'禁止换行，超出容器部分会以 ... 方式截断'}}
+				</view>
+			</picker>
+		</view>
+	</view>
+	<view class="view3">
+		<view class="cu-form-group margin-top">
+			<view class="title">反馈内容</view>
+		</view>
+		<view class="textareaView">
+			<textarea class="textarea"></textarea>
+		</view>
+	</view>
+
+</view>

pages/article/feedback/index.wxss

@@ -0,0 +1,30 @@
+/* pages/article/feedback/index.wxss */
+page{
+  background-color: white;
+}
+.zt{
+  width: 100%;
+  padding: 0rpx 32rpx 0rpx 32rpx;
+}
+.view1{
+  width: 100%;
+  height: 100rpx;
+  border-top: 2rpx solid #f3f3f3;
+}
+.view2{
+  width: 100%;
+  height: 100rpx;
+  border-top: 2rpx solid #f3f3f3;
+}
+.view3{
+  width: 100%;
+  height: 394rpx;
+  border-top: 2rpx solid #f3f3f3;
+}
+.textarea{
+  height:306rpx;
+  
+}
+.textareaView{
+  border: 2prx solid black;
+}

pages/article/index/index.js

@@ -18,6 +18,9 @@ Component({
     tabIndex: 0
   },
   methods: {
+    onLoad:function(){
+      this.onRestart()
+    },
     onRestart: function () {
       var fragment = this.selectComponent('#fragment' + this.data.tabIndex)
       if (fragment) {

pages/article/index/index.wxml

@@ -1,5 +1,5 @@
 <!--pages/main/index.wxml-->
-<cu-custom bgColor="bg-white" isBack="{{false}}">
+<cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content" style="color:black;font-size:36rpx">情报</view>
 </cu-custom>
 
@@ -18,4 +18,4 @@
 	<view class="roder-add flex flex-center">
 		<text class="cuIcon-add text-white" style="font-size:32px"></text>
 	</view>
-</view>
+</view>

pages/article/newInfo/index.js

@@ -0,0 +1,102 @@
+// pages/stock/index.js
+const util = require('../../../utils/util')
+const app = getApp()
+import {
+  getPaperMillOfInformationList
+} from "../../api/ztb"
+
+Component({
+  options: {
+    addGlobalClass: true,
+    multipleSlots: true
+  },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    height: app.globalData.safeFragmentHeight - 190,
+    safeBottom: app.globalData.safeBottom,
+    orderList: [],
+    tableSgin: null,
+    loading:false,
+    pximg:'/assets/info/px-mr.png'
+
+  },
+  methods: {
+    onRestart: function () {
+      this.setData({
+        StatusBar: app.globalData.StatusBar || 40,
+        CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80),
+      })
+      this.getPaperMillOfInformationListFct({
+        queryWay: 0
+      })
+    },
+    toPage: function (e) {
+      if (e.currentTarget.id == 'toqb') {
+        util.navigateTo('/pages/article/index/index')
+      }
+      if (e.currentTarget.id == 'toAllFactory') {
+        util.navigateTo('/pages/article/allNewInfo/index')
+      }
+      if(e.currentTarget.id == 'toAttentionFactory'){
+        util.navigateTo('/pages/home/attentionPaperList/index')
+      }
+      if(e.currentTarget.id == 'tofeedback'){
+        util.navigateTo('/pages/article/feedback/index')
+      }
+      
+    },
+    changeTable: function (e) {
+      var a = e.currentTarget.id
+      if (e.currentTarget.id === this.data.tableSgin) {
+        this.setData({
+          tableSgin: null
+        })
+      } else {
+        this.setData({
+          tableSgin: e.currentTarget.id
+        })
+      }
+    },
+    getPaperMillOfInformationListFct:function(model) {
+      this.setData({
+        loading:true
+      })
+      getPaperMillOfInformationList(model).then(res => {
+        this.setData({
+          orderList: res.data
+        })
+        this.setData({
+          loading:false
+        })
+      })
+    },
+    changeSort:function(){
+      if(this.data.pximg=='/assets/info/px-mr.png'){
+        this.setData({
+          pximg:'/assets/info/px-sx.png'
+        })
+        this.getPaperMillOfInformationListFct({queryWay: 0,priceSort:1})
+        return
+      }
+      if(this.data.pximg=='/assets/info/px-sx.png'){
+        this.setData({
+          pximg:'/assets/info/px-jx.png'
+        })
+        this.getPaperMillOfInformationListFct({queryWay: 0,priceSort:0})
+        return
+      }
+      if(this.data.pximg=='/assets/info/px-jx.png'){
+        this.setData({
+          pximg:'/assets/info/px-mr.png'
+        })
+        this.getPaperMillOfInformationListFct({queryWay: 0})
+        return
+      }
+    }
+
+  },
+
+
+})

pages/article/newInfo/index.json

@@ -0,0 +1,12 @@
+{
+  "component": true,
+  "usingComponents": {
+    "wux-tabi": "/components/tabi/index",
+    "hot": "/pages/article/hot-index/index",
+    "price": "/pages/article/price-index/index",
+    "queue": "/pages/article/queue-index/index",
+    "point": "/pages/article/point-index/index",
+    "wux-accordion-group": "/components/accordion-group/index",
+    "wux-accordion": "/components/accordion/index"
+  }
+}

pages/article/newInfo/index.wxml

@@ -0,0 +1,119 @@
+<!--pages/main/index.wxml-->
+<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
+<view style="background-image: linear-gradient(127deg, rgba(0,122,255,0.67) 0%, rgba(13,100,227,0.95) 100%);">
+	<view class="cu-custom" style="height:{{CustomBar}}px;z-index: 99">
+		<view class="cu-bar fixed " style="height:{{CustomBar}}px;padding-top:{{StatusBar}}rpx;border-bottom:none">
+			<view class="content" style="top:{{StatusBar}}rpx;color:black;font-size:36rpx">
+				<view slot="content" class="text-white">情报</view>
+			</view>
+		</view>
+	</view>
+	<view style="width:100%;height:60rpx;" class="topTitle">
+		<view class="topLeft">
+			<view class="topLeftText">纸厂情报</view>
+			<view class="topLeftTime">2021-01-04</view>
+		</view>
+		<view class="topRight">
+			<view class="topRightText" id="toAllFactory" bindtap="toPage">全部纸厂></view>
+			<view class="topRightIcon" id='tofeedback' bindtap="toPage">
+				<image style="width:31.3rpx;height:32.4rpx" src="/assets/info/feedback-white.png"></image>
+			</view>
+		</view>
+	</view>
+</view>
+<view style="width:100%;height:15rpx;"></view>
+<view class="zt">
+	<view class="flex flex-justify" style="width:100%;height:80rpx;lineheight:80rpx;font-size: 28px;color: rgba(0,0,0,0.65);letter-spacing: 0;padding: 0rpx 40rpx 0rpx 40rpx;">
+		<view class="text-df text-gray" style="flex:1.2;overflow: hidden;">纸厂名称</view>
+		<view class="text-df text-gray" style="flex:1;text-align: center" bindtap="changeSort">价格涨跌<image style="width:30rpx;height:30rpx" src="{{pximg}}"></image>
+		</view>
+		<view class="text-df text-gray" style="flex:1;text-align: center">纸厂排队</view>
+		<view class="text-df text-gray" style="flex:1;text-align: center">最近扣点</view>
+		<view class="text-df text-gray" style="flex:0.5;text-align: center">更多</view>
+	</view>
+	<scroll-view scroll-y="true" style='max-height:700rpx;width:100%;background-color:white'>
+		<view class="img-nodata" style="height:{{height}}rpx" wx:if="{{!orderList.length}}">
+			<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
+			<image class="onDataImg" src="/assets/info/noData.png" wx:else></image>
+			<view style="font-family: PingFangSC-Medium;font-size: 40rpx;color: #000000;letter-spacing: 0;text-align: left;margin-top:30rpx">{{loading? '正在加载' : '暂无关注'}}</view>
+			<view class="top-nodata-text1">可前往纸厂列表添加关注</view>
+			<view class="top-nodata-text2" id="toAttentionFactory" bindtap="toPage">添加关注</view>
+		</view>
+		<!-- <view class="bg-white" wx:else> -->
+		<view class="bg-white">
+			<view wx:for="{{orderList}}" wx:key="index" class="tableStyle">
+				<view class="flex flex-justify" style="border-top:2rpx solid #f3f3f3;margin-top:20rpx;padding: 0rpx 40rpx 0rpx 40rpx;">
+					<!-- <text class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayTotalQuantity || 0}}%</text> -->
+					<view class="text-df text-balck" style="flex:1.2">{{item.name}}</view>
+					<view class="text-df {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{item.biggestFloatPrice||0}} %</view>
+					<view class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayRetainedQuantity || 0}}辆</view>
+					<view class="text-df text-balck" style="flex:1;text-align: center">{{item.minimumDeductionPoint || 0}}%</view>
+					<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillid}}" bindtap="changeTable" wx:if="{{tableSgin==item.paperMillid}}">
+						<image style="width:28rpx;height:28rpx;" src="/assets/info/factoryUp.png"></image>
+					</view>
+					<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillid}}" bindtap="changeTable" wx:if="{{tableSgin !== item.paperMillid}}">
+						<image style="width:28rpx;height:28rpx;" src="/assets/info/factoryDown.png"></image>
+					</view>
+				</view>
+
+				<view wx:if="{{tableSgin==item.paperMillid}}" style="width:100%;background-color:#f3f3f3;padding-left:10rpx;padding:10rpx 24rpx 15rpx 24rpx">
+					<view class="flex flex-justify" style="">
+						<view class="text-df text-gray" style="flex:1;text-align: center">品类</view>
+						<view class="text-df text-gray" style="flex:1;text-align: center">价格</view>
+						<view class="text-df text-gray" style="flex:1;text-align: center">涨跌</view>
+						<view class="text-df text-gray" style="flex:1;text-align: center">最近扣点</view>
+						<view class="text-df text-gray" style="flex:1;text-align: center">操作</view>
+					</view>
+					<view class="flex flex-justify" style="margin-top:20rpx" wx:for="{{ item.paperCategoryList }}" wx:for-item="cell" wx:key="cell.categoryId" style="background-color:white;margin-top:10rpx">
+						<view class="text-df {{cell.categoryName>0?'text-red':(cell.categoryName<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{cell.categoryName|| '---'}}</view>
+						<view class="text-df {{cell.unitPrice>0?'text-red':(cell.unitPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.unitPrice|| 0}}</view>
+						<view class="text-df {{cell.floatPrice>0?'text-red':(cell.floatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.floatPrice|| 0}}</view>
+						<view class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view>
+						<view class="text-df text-balck" style="flex:1;text-align: center">
+							<view class="son-table-btn">代卖</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</scroll-view>
+</view>
+<view style="width:100%;height:10rpx;background-color:#f3f3f3"></view>
+<view class="midTietle">
+	<view class="midTietleText1">行业情报</view>
+	<view class="midTietleText2" id="toqb" bindtap="toPage">更多资讯></view>
+</view>
+<view style="width:100%;height:5rpx;background-color:#f3f3f3"></view>
+<scroll-view scroll-y="true" style='height:684rpx;width:100%;background-color:white'>
+	<!-- background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png); -->
+	<view class="bottomView">
+		<view class="bottomViewleft">
+			<view class="bottomViewleft-top"> 玖龙扣点加重或引发涨价潮，玖龙扣点。</view>
+			<view class="bottomViewleft-bottem" style="font-family: PingFangSC-Regular;font-size: 24rpx;color: rgba(0,0,0,0.50);">
+				<view style="width:168rpx;height:33rpx;float:left;line-height:33rpx">纸通宝情报中心</view>
+				<view style="width:210rpx;height:33rpx;float:right;line-height:33rpx">2021-02-04 10:13</view>
+			</view>
+		</view>
+		<view class="bottomViewRight"></view>
+	</view>
+	<view class="bottomView">
+		<view class="bottomViewleft">
+			<view class="bottomViewleft-top"> 玖龙扣点加重或引发涨价潮，玖龙扣点。</view>
+			<view class="bottomViewleft-bottem" style="font-family: PingFangSC-Regular;font-size: 24rpx;color: rgba(0,0,0,0.50);">
+				<view style="width:168rpx;height:33rpx;float:left;line-height:33rpx">纸通宝情报中心</view>
+				<view style="width:210rpx;height:33rpx;float:right;line-height:33rpx">2021-02-04 10:13</view>
+			</view>
+		</view>
+		<view class="bottomViewRight"></view>
+	</view>
+	<view class="bottomView">
+		<view class="bottomViewleft">
+			<view class="bottomViewleft-top"> <view style="background: #007AFF;border-radius: 5px;border-radius: 5px;width:160rpx;height:41rpx;color: #007AFF;">#东莞玖龙</view>玖龙扣点加重或引发涨价潮，玖龙扣点。</view>
+			<view class="bottomViewleft-bottem" style="font-family: PingFangSC-Regular;font-size: 24rpx;color: rgba(0,0,0,0.50);">
+				<view style="width:168rpx;height:33rpx;float:left;line-height:33rpx">纸通宝情报中心</view>
+				<view style="width:210rpx;height:33rpx;float:right;line-height:33rpx">2021-02-04 10:13</view>
+			</view>
+		</view>
+		<view class="bottomViewRight"></view>
+	</view>
+</scroll-view>

pages/article/newInfo/index.wxss

@@ -0,0 +1,201 @@
+/* pages/main/index.wxss */
+page {
+  background-color: white;
+}
+
+.booking-tool {
+  width: calc(100% - 20px);
+  background-color: #008AFF;
+  position: fixed;
+  left: 25px;
+}
+
+.roder-add {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100rpx;
+  height: 100rpx;
+  background-color: #008AFF;
+  border-radius: 50rpx;
+  position: absolute;
+  top: 24px;
+  right: 24px;
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+}
+
+.boderLine {
+  width: 100%;
+  height: 50rpx;
+  background-color: #f3f3f3;
+}
+
+.midTietle {
+  height: 100rpx;
+  width: 100%;
+  background-color: white;
+  display: flex;
+  justify-content: space-between;
+  padding: 0rpx 40rpx 0rpx 40rpx;
+}
+
+.midTietleText1 {
+  height: 100rpx;
+  line-height: 100rpx;
+  font-family: PingFangSC-Medium;
+  font-size: 36rpx;
+  color: rgba(0, 0, 0, 0.85);
+  letter-spacing: 0;
+  text-align: left;
+}
+
+.midTietleText2 {
+  height: 100rpx;
+  line-height: 100rpx;
+  font-family: PingFangSC-Regular;
+  font-size: 28rpx;
+  color: rgba(0, 0, 0, 0.65);
+  letter-spacing: 0;
+  text-align: right;
+}
+
+.zt {
+  background-color: white;
+}
+
+.topTitle {
+  display: flex;
+  justify-content: space-between;
+}
+
+.topRight {
+  width: 50%;
+  height: 60rpx;
+}
+
+.topLeft {
+  width: 50%;
+  height: 60rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.topLeftText {
+  font-family: PingFangSC-Medium;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  height: 60rpx;
+  line-height: 60rpx;
+  padding-left: 32rpx;
+}
+
+.topLeftTime {
+  font-family: PingFangSC-Medium;
+  font-size: 28rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  height: 60rpx;
+  line-height: 60rpx;
+}
+
+.topRightText {
+  font-family: PingFangSC-Medium;
+  font-size: 28rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  height: 60rpx;
+  line-height: 60rpx;
+  float: right;
+  margin-right: 38.5rpx;
+}
+
+.topRightIcon {
+  height: 60rpx;
+  float: right;
+  display: flex;
+  align-items: center;
+  margin-right: 36.3rpx;
+}
+
+.onDataImg {
+  width: 320rpx;
+  height: 249rpx;
+}
+
+.img-nodata {
+  width: 100%;
+  height: 548rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 30rpx;
+}
+
+.top-nodata-text1 {
+  font-family: PingFangSC-Medium;
+  font-size: 30rpx;
+  color: rgba(0, 0, 0, 0.75);
+  letter-spacing: 0;
+  text-align: left;
+  margin-top: 16rpx;
+}
+
+.top-nodata-text2 {
+  width: 480rpx;
+  height: 88rpx;
+  background: #007AFF;
+  border-radius: 10rpx;
+  border-radius: 10rpx;
+  font-family: PingFangSC-Medium;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  text-align: left;
+  line-height: 88rpx;
+  text-align: center;
+  margin-top: 41rpx;
+}
+
+.bottomView {
+  width: 750rpx;
+  height: 228rpx;
+ 
+  padding: 24rpx 32rpx 24rpx 32rpx
+}
+
+.bottomViewleft {
+  width: 423rpx;
+  height: 180rpx;
+
+  float: left;
+}
+
+.bottomViewRight {
+  width: 240rpx;
+  height: 180rpx;
+  background-color: green;
+  float: right;
+}
+
+.tableStyle {
+  width: 100%;
+  line-height: 100rpx;
+  font-size: 34rpx;
+  color: rgba(0, 0, 0, 0.85);
+  letter-spacing: 0;
+}
+.son-table-btn{
+  width:120rpx;height:56rpx;line-height:56rpx;font-size: 26rpx;color: #007AFF;letter-spacing: 0;text-align: left;background: #FFFFFF;border: 1rpx solid #007AFF;border-radius: 28rpx;border-radius: 28rpx;text-align: center;
+}
+.bottomViewleft-top{
+  width: 100%;
+  height: 90rpx;
+
+}
+.bottomViewleft-bottem{
+  width: 100%;
+  height: 33rpx;
+
+  margin-top: 57rpx;
+}

pages/goods/create/index.js

@@ -126,6 +126,7 @@ Page({
           this.data.dopantList.forEach(element => {
             if (Number(element.value) == Number(result.data.dopantRate)) {
               this.data.dopantName = element.text
+              debugger
             }
           })
         }

pages/index/index.js

@@ -242,7 +242,7 @@ Page({
     }
     // wx.navigateTo({ url: '/pages/home/tab1/index' })
      var a=storage.get('isTokenHaveStatus')
-    if(a==true){
+    if(a==true && app.globalData.token){
       getBaseInfo().then(result => {
         this.setData({
           hasShowedLoginTag: result.data.hasShowedLoginTag

pages/index/index.json

@@ -1,7 +1,7 @@
 {
   "usingComponents": {
     "mall": "/pages/mall/index/index",
-    "article": "/pages/article/index/index",
+    "article": "/pages/article/newInfo/index",
     "home": "/pages/home/index/index",
     "wux-image": "/components/image/index",
     "wux-popup": "/components/popup/index"

utils/util.js

@@ -186,7 +186,10 @@ const tokenList = [
   '/pages/agent/order/index',
   '/pages/home/idcard/index',
   '/pages/shop/detail/index',
-  '/pages/article/publish/index'
+  '/pages/article/publish/index',
+  '/pages/home/attentionPaperList/index',
+  '/pages/article/feedback/index'
+  
 ]
 
 function navigateTo(url){