From 72c585db13be84d4f3ebdc33649b1ebf67347e15 Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Sat, 6 Feb 2021 18:54:01 +0800
Subject: [PATCH] =?UTF-8?q?UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              |   2 +-
 assets/info/timeDown.png            | Bin 0 -> 189 bytes
 pages/article/allNewInfo/index.wxml |   4 ++--
 pages/article/feedback/index.wxml   |   6 +++---
 pages/article/feedback/index.wxss   |  12 ++++++------
 pages/article/newInfo/index.js      |  14 +++-----------
 pages/article/newInfo/index.wxml    |  14 ++++++++------
 pages/article/newInfo/index.wxss    |   1 -
 8 files changed, 23 insertions(+), 30 deletions(-)
 create mode 100644 assets/info/timeDown.png

diff --git a/app.js b/app.js
index 6ddae6a..ade7531 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
  //app.js
 App({
    //----------------------------------------------globalData--------------------------------------
-   evn: 1,//0:开发环境，1：测试环境，2：生产环境
+   evn: 0,//0:开发环境，1：测试环境，2：生产环境
    tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
    agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
    version: 152,
diff --git a/assets/info/timeDown.png b/assets/info/timeDown.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f682bc1982f967e02152d5c4545ad7cc1ff20da
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=9FI?nRG-Ko#62L4Lsu
zX(4g)k~|R>!fgK-***e=9XwqeLpZJ{E3j?QXl!I=ZdZ^nF(}Y%%2>$C!}C(XO)@}m
z_QC}V3Ya{8rZ_r!Z?Fq<Jjl?&*{2k+ID+{@G%JI!H@l49*M>}xBRpOGT-G@yGywo&
CdMW4t

literal 0
HcmV?d00001

diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml
index 52c62fe..3029b11 100644
--- a/pages/article/allNewInfo/index.wxml
+++ b/pages/article/allNewInfo/index.wxml
@@ -11,7 +11,7 @@
 		</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 class="text-df text-gray" style="flex:0.5;text-align: center"></view>
 	</view>
 	<scroll-view scroll-y="true" style='max-height:1050rpx;width:100%;background-color:white'>
 		<view class="img-nodata" style="height:{{height}}rpx" wx:if="{{!orderList.length}}">
@@ -29,7 +29,7 @@
 					<!-- <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.shortName}}<view wx:if="{{item.hasFollowed==true}}" class="yesAttention">已关注</view><view wx:if="{{item.hasFollowed==false}}" class="noAttention">已取消</view></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*1000||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.yesterdayTotalQuantity || 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}}" catchtap="changeTable" wx:if="{{tableSgin==item.paperMillId}}">
 						<image style="width:28rpx;height:28rpx;" src="/assets/info/factoryUp.png"></image>
diff --git a/pages/article/feedback/index.wxml b/pages/article/feedback/index.wxml
index 432de66..2f86f46 100644
--- a/pages/article/feedback/index.wxml
+++ b/pages/article/feedback/index.wxml
@@ -4,7 +4,7 @@
 </cu-custom>
 <view class="zt">
 	<view class="view1">
-		<view class="cu-form-group margin-top">
+		<view class="cu-form-group margin-top" style="border-bottom: none;">
 			<view class="title">反馈纸厂</view>
 			<picker bindchange="PickerChange" value="{{fatoryNameIndex}}" range="{{fatoryNameList}}">
 				<view class="picker">
@@ -14,7 +14,7 @@
 		</view>
 	</view>
 	<view class="view2">
-		<view class="cu-form-group margin-top">
+		<view class="cu-form-group margin-top" style="border-bottom: none;">
 			<view class="title">反馈类型</view>
 			<picker bindchange="typeChange" value="{{typeIndex}}" range="{{typeList}}">
 				<view class="picker">
@@ -29,7 +29,7 @@
 		</view>
 		<view style="padding-left:32rpx;padding-right:32rpx">
 			<view class="textareaView">
-				<textarea class="textarea" value='{{postForm.content}}'   bindinput='textareaBindblur'></textarea>
+				<textarea class="textarea" placeholder="请输入反馈内容，最多200字" value='{{postForm.content}}'   bindinput='textareaBindblur'></textarea>
 			</view>
 		</view>
 
diff --git a/pages/article/feedback/index.wxss b/pages/article/feedback/index.wxss
index 23821d4..ce0b89b 100644
--- a/pages/article/feedback/index.wxss
+++ b/pages/article/feedback/index.wxss
@@ -9,21 +9,21 @@ page {
 }
 
 .view1 {
+  padding: 0rxp;
   width: 100%;
-  height: 100rpx;
-  border-top: 2rpx solid #f3f3f3;
+  border-bottom: 2rpx solid #f3f3f3;
 }
 
 .view2 {
   width: 100%;
-  height: 100rpx;
-  border-top: 2rpx solid #f3f3f3;
+ 
+  border-bottom: 2rpx solid #f3f3f3;
 }
 
 .view3 {
   width: 100%;
   height: 394rpx;
-  border-top: 2rpx solid #f3f3f3;
+  /* border-top: 2rpx solid #f3f3f3; */
 }
 
 .textarea {
@@ -32,7 +32,7 @@ page {
 }
 
 .textareaView {
-  border: 1px solid;
+  border: 1px solid #dfdfdf;
 }
 
 .view4 {
diff --git a/pages/article/newInfo/index.js b/pages/article/newInfo/index.js
index 4d36346..3152e10 100644
--- a/pages/article/newInfo/index.js
+++ b/pages/article/newInfo/index.js
@@ -19,12 +19,12 @@ Component({
     orderList: [],
     tableSgin: null,
     loading:false,
-    pximg:'/assets/info/px-mr.png',
+    pximg:'/assets/info/px-sx.png',
     curDate: util.formatDate(new Date(), 'Y-M-D'),
     querFrom:{
       curDate: util.formatDate(new Date(), 'Y-M-D'),
       queryWay: 0,
-      priceSort:0
+      priceSort:1
     },
     factoryList:[]
 
@@ -91,7 +91,7 @@ Component({
       })
     },
     changeSort:function(){
-      if(this.data.pximg=='/assets/info/px-mr.png'){
+      if(this.data.pximg=='/assets/info/px-jx.png'){
         this.setData({
           pximg:'/assets/info/px-sx.png'
         })
@@ -107,14 +107,6 @@ Component({
         this.getPaperMillOfInformationListFct(this.data.querFrom)
         return
       }
-      if(this.data.pximg=='/assets/info/px-jx.png'){
-        this.setData({
-          pximg:'/assets/info/px-mr.png'
-        })
-        this.data.querFrom.priceSort=0
-        this.getPaperMillOfInformationListFct(this.data.querFrom)
-        return
-      }
     },
     curDateChange(e) {
       this.setData({
diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml
index 76f68aa..3beb9cb 100644
--- a/pages/article/newInfo/index.wxml
+++ b/pages/article/newInfo/index.wxml
@@ -12,9 +12,12 @@
 	<view style="height:15rpx;width:100%"></view>
 	<view style="width:100%;height:70rpx;background-color:#F4F4F4;" class="topTitle">
 		<view class="topLeft">
-			<picker mode="date" value="{{curDate}}" start="2015-09-01" end="2020-09-01" bindchange="curDateChange">
+			<picker mode="date" value="{{curDate}}" start="2015-09-01" end="2099-09-01" bindchange="curDateChange">
 				<view class="piker">
 					{{curDate}}
+					<view style="width:16rpx;height:70rpx; display: flex;align-items: center;float: right;margin-left:10rpx">
+						<image style="width:16rpx;height:16rpx" src="/assets/info/timeDown.png"></image>
+					</view>
 				</view>
 			</picker>
 		</view>
@@ -36,7 +39,7 @@
 		</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 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}}">
@@ -49,12 +52,11 @@
 		<!-- <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;"
-				id="toFactoryDetails" data-factoryId="{{item.paperMillId}}" catchtap="toPage">
+				<view class="flex flex-justify" style="border-top:2rpx solid #f3f3f3;margin-top:20rpx;padding: 0rpx 40rpx 0rpx 40rpx;" id="toFactoryDetails" data-factoryId="{{item.paperMillId}}" catchtap="toPage">
 					<!-- <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.shortName}}</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*1000||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.yesterdayTotalQuantity || 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}}" catchtap="changeTable" wx:if="{{tableSgin==item.paperMillId}}">
 						<image style="width:28rpx;height:28rpx;" src="/assets/info/factoryUp.png"></image>
@@ -98,7 +100,7 @@
 		<view class="bottomViewleft">
 			<view class="bottomViewleft-top">
 				<view style="height41rpx;line-height:41rpx;font-size: 24rpx;color: #007AFF;">
-					<wux-tag id="{{item.millPaperId}}" catchtap="toMill">
+					<wux-tag id="{{item.millPaperId}}" catchtap="toMill" wx:if="{{item.millPaperName}}">
 						<text style="background-color:#ddd;border-radius: 32rpx;text-align: center;width:25rpx;height:32rpx;line-height:32rpx">#</text>
 						<text class="text-df" style="margin-left:10rpx">{{item.millPaperName}}</text>
 					</wux-tag>
diff --git a/pages/article/newInfo/index.wxss b/pages/article/newInfo/index.wxss
index 3d139cd..d8047eb 100644
--- a/pages/article/newInfo/index.wxss
+++ b/pages/article/newInfo/index.wxss
@@ -192,7 +192,6 @@ page {
 .bottomViewRight {
   width: 240rpx;
   height: 180rpx;
-  background-color: green;
   float: right;
 }