From 45cbb4829d0f579e75a914e5c403f1ef8a3ba7b5 Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Sat, 6 Feb 2021 13:56:26 +0800
Subject: [PATCH] 2-6-2.17UI

---
 app.json                           |   1 +
 assets/info/sucessful.png          | Bin 0 -> 2842 bytes
 pages/api/ztb.js                   |   6 ++-
 pages/article/feedback/index.js    |  63 ++++++++++++++++++++++++--
 pages/article/feedback/index.wxml  |  18 +++++---
 pages/article/feedback/index.wxss  |  45 +++++++++++++++----
 pages/article/sucessFul/index.js   |  70 +++++++++++++++++++++++++++++
 pages/article/sucessFul/index.json |   3 ++
 pages/article/sucessFul/index.wxml |  11 +++++
 pages/article/sucessFul/index.wxss |  35 +++++++++++++++
 10 files changed, 231 insertions(+), 21 deletions(-)
 create mode 100644 assets/info/sucessful.png
 create mode 100644 pages/article/sucessFul/index.js
 create mode 100644 pages/article/sucessFul/index.json
 create mode 100644 pages/article/sucessFul/index.wxml
 create mode 100644 pages/article/sucessFul/index.wxss

diff --git a/app.json b/app.json
index 06a2002..7f25e6e 100644
--- a/app.json
+++ b/app.json
@@ -36,6 +36,7 @@
     "pages/article/feedback/index",
     "pages/article/list/index",
     "pages/article/attentionPaperFactory/index",
+    "pages/article/sucessFul/index",
     "pages/goods/ablility/index",
     "pages/goods/index/index",
     "pages/goods/detail/index",
diff --git a/assets/info/sucessful.png b/assets/info/sucessful.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dfcb5bb0b25483a6d80e0552bae8bc41a3b9826
GIT binary patch
literal 2842
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

literal 0
HcmV?d00001

diff --git a/pages/api/ztb.js b/pages/api/ztb.js
index 8dab779..7f50b8c 100644
--- a/pages/api/ztb.js
+++ b/pages/api/ztb.js
@@ -129,7 +129,8 @@ const updateUserInfoZtb = (params) => mPost(`/recycle-service/user/update/user-i
 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)
-
+//反馈纸厂情报
+const feedbackMillInformation = (params) => mPost(`/recycle-service/feedback/mill-information`, params, zconfig)
 
 
 export {
@@ -226,5 +227,6 @@ export {
   updateUserInfo,
   updateUserInfoZtb,
   userPushFollowMill,
-  getPaperMillOfInformationList
+  getPaperMillOfInformationList,
+  feedbackMillInformation
 }
\ No newline at end of file
diff --git a/pages/article/feedback/index.js b/pages/article/feedback/index.js
index a7bdcb1..b9665bf 100644
--- a/pages/article/feedback/index.js
+++ b/pages/article/feedback/index.js
@@ -1,19 +1,30 @@
 // pages/article/feedback/index.js
+import { getAllFactoryList,feedbackMillInformation} from "../../api/ztb"
+const util = require('../../../utils/util')
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    picker: ['喵喵喵', '汪汪汪', '哼唧哼唧'],
-    index: null,
-
+    millIdList:[],
+    fatoryNameList: [],
+    fatoryNameIndex: null,
+    typeIdList:['1','2','3'],
+    typeList:['价格','纸厂排队','最近扣点'],
+    typeIndex:null,
+    postForm:{
+      content:'',
+      millId:null,
+      type:null
+    }
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.getAllFactoryListFct()
 
   },
 
@@ -68,7 +79,51 @@ Page({
   PickerChange(e) {
     console.log(e);
     this.setData({
-      index: e.detail.value
+      fatoryNameIndex: e.detail.value,
+      'postForm.millId':this.data.millIdList[e.detail.value]
     })
   },
+  typeChange(e) {
+    console.log(e);
+    this.setData({
+      typeIndex: e.detail.value,
+      'postForm.type':this.data.typeIdList[e.detail.value]
+    })
+  },
+  getAllFactoryListFct:function(){
+    this.data.fatoryNameList=[]
+    this.data.millIdList=[]
+    var jxFatoryNameList=[]
+    var jxMillIdList=[]
+    getAllFactoryList().then(res=>{
+      res.data.forEach(element => {
+        jxFatoryNameList.push(element.name)
+        jxMillIdList.push(element.paperMillId)      
+      });
+      this.setData({
+        fatoryNameList: jxFatoryNameList,
+        millIdList:jxMillIdList
+      })
+
+    })
+  },
+  subFeedBack:function(){
+    this.feedbackMillInformationFct(this.data.postForm)
+  },
+  textareaBindblur:function(e){
+    // console.log(e.detail.value)
+    this.setData({
+      'postForm.content':e.detail.value
+    })
+  },
+  feedbackMillInformationFct:function(model){
+    feedbackMillInformation(model).then(res=>{
+      if(res.code==0){
+        util.showToast('提交成功！')
+        util.navigateTo('/pages/article/sucessFul/index')
+      }else{
+        util.showToast('提交失败失败！原因：'+res.message)
+      }
+    })
+  }
 })
\ No newline at end of file
diff --git a/pages/article/feedback/index.wxml b/pages/article/feedback/index.wxml
index 33c5d7f..432de66 100644
--- a/pages/article/feedback/index.wxml
+++ b/pages/article/feedback/index.wxml
@@ -6,9 +6,9 @@
 	<view class="view1">
 		<view class="cu-form-group margin-top">
 			<view class="title">反馈纸厂</view>
-			<picker bindchange="PickerChange" value="{{index}}" range="{{picker}}">
+			<picker bindchange="PickerChange" value="{{fatoryNameIndex}}" range="{{fatoryNameList}}">
 				<view class="picker">
-					{{index?picker[index]:'禁止换行，超出容器部分会以 ... 方式截断'}}
+					{{fatoryNameIndex?fatoryNameList[fatoryNameIndex]:'请选择纸厂'}}
 				</view>
 			</picker>
 		</view>
@@ -16,9 +16,9 @@
 	<view class="view2">
 		<view class="cu-form-group margin-top">
 			<view class="title">反馈类型</view>
-			<picker bindchange="PickerChange" value="{{index}}" range="{{picker}}">
+			<picker bindchange="typeChange" value="{{typeIndex}}" range="{{typeList}}">
 				<view class="picker">
-					{{index?picker[index]:'禁止换行，超出容器部分会以 ... 方式截断'}}
+					{{typeIndex?typeList[typeIndex]:'请选择反馈类型'}}
 				</view>
 			</picker>
 		</view>
@@ -27,9 +27,15 @@
 		<view class="cu-form-group margin-top">
 			<view class="title">反馈内容</view>
 		</view>
-		<view class="textareaView">
-			<textarea class="textarea"></textarea>
+		<view style="padding-left:32rpx;padding-right:32rpx">
+			<view class="textareaView">
+				<textarea class="textarea" value='{{postForm.content}}'   bindinput='textareaBindblur'></textarea>
+			</view>
 		</view>
+
+	</view>
+	<view class="view4" bindtap="subFeedBack">
+	<view class="sbtn">提交反馈</view>
 	</view>
 
 </view>
\ No newline at end of file
diff --git a/pages/article/feedback/index.wxss b/pages/article/feedback/index.wxss
index 8367264..23821d4 100644
--- a/pages/article/feedback/index.wxss
+++ b/pages/article/feedback/index.wxss
@@ -1,30 +1,57 @@
 /* pages/article/feedback/index.wxss */
-page{
+page {
   background-color: white;
 }
-.zt{
+
+.zt {
   width: 100%;
   padding: 0rpx 32rpx 0rpx 32rpx;
 }
-.view1{
+
+.view1 {
   width: 100%;
   height: 100rpx;
   border-top: 2rpx solid #f3f3f3;
 }
-.view2{
+
+.view2 {
   width: 100%;
   height: 100rpx;
   border-top: 2rpx solid #f3f3f3;
 }
-.view3{
+
+.view3 {
   width: 100%;
   height: 394rpx;
   border-top: 2rpx solid #f3f3f3;
 }
-.textarea{
-  height:306rpx;
-  
+
+.textarea {
+  height: 306rpx;
+
 }
-.textareaView{
+
+.textareaView {
   border: 1px solid;
+}
+
+.view4 {
+  width: 100%;
+  height: 96rpx;
+  margin-top: 400rpx;
+}
+
+.sbtn {
+  width: 686rpx;
+  height: 96rpx;
+  background: #007AFF;
+  border-radius: 8rpx;
+  border-radius: 8rpx;
+  font-family: PingFangSC-Regular;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  text-align: left;
+  line-height: 96rpx;
+  text-align: center;
 }
\ No newline at end of file
diff --git a/pages/article/sucessFul/index.js b/pages/article/sucessFul/index.js
new file mode 100644
index 0000000..3c07772
--- /dev/null
+++ b/pages/article/sucessFul/index.js
@@ -0,0 +1,70 @@
+// pages/article/sucessFul/index.js
+const util = require('../../../utils/util')
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  rt:function(){
+    wx.navigateBack()
+  }
+})
\ No newline at end of file
diff --git a/pages/article/sucessFul/index.json b/pages/article/sucessFul/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/article/sucessFul/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/article/sucessFul/index.wxml b/pages/article/sucessFul/index.wxml
new file mode 100644
index 0000000..a7370e3
--- /dev/null
+++ b/pages/article/sucessFul/index.wxml
@@ -0,0 +1,11 @@
+<!--pages/article/sucessFul/index.wxml-->
+<view class="zt">
+	<view class="view1">
+	<image style="width:198.3rpx;height:198.3rpx" src="/assets/info/sucessful.png"></image>
+	</view>
+	<view class="view2">您反馈的情报信息已查收，谢谢您对平台的参与和支持。</view>
+	<view class="view3">
+	<view class="btnView" bindtap="rt">关闭</view>
+	
+	</view>
+</view>
\ No newline at end of file
diff --git a/pages/article/sucessFul/index.wxss b/pages/article/sucessFul/index.wxss
new file mode 100644
index 0000000..f45ed74
--- /dev/null
+++ b/pages/article/sucessFul/index.wxss
@@ -0,0 +1,35 @@
+/* pages/article/sucessFul/index.wxss */
+page {
+  background-color: white;
+}
+
+.view1 {
+  padding: 120rpx 275rpx 97rpx 275.8rpx;
+}
+
+.view2 {
+  font-family: PingFangSC-Regular;
+  font-size: 32rpx;
+  color: rgba(0, 0, 0, 0.75);
+  text-align: center;
+  padding-left: 55rpx;
+  padding-right: 55rpx;
+}
+
+.view3 {
+  padding-left: 32rpx;
+  padding-right: 32rpx;
+  margin-top: 80rpx;
+}
+
+.btnView {
+  background: #007AFF;
+  height: 96rpx;
+  border-radius: 8rpx;
+  border-radius: 8rpx;
+  font-family: PingFangSC-Regular;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 96rpx;
+}
\ No newline at end of file