From a7091ad1b1c7e7bf7616d7e8da01bf10a530cd57 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 16 Jun 2021 09:37:59 +0800
Subject: [PATCH] no message

---
 app.js                           |  2 +-
 pages/home/index/index.wxml      |  4 ++--
 pages/process/payment/index.js   | 23 ++++++++++++++++++-----
 pages/process/payment/index.wxml |  4 +++-
 pages/process/payment/index.wxss |  8 ++++++++
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 76ed0a8..1432a24 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,6 @@
 //app.js
 App({
-  evn: 0, // 0: 开发版本；1：测试版本；2：生产版本
+  evn: 2, // 0: 开发版本；1：测试版本；2：生产版本
   tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'],
   version: '2.1.0',
   xAppId: '503258978847953926',
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index e64ebec..f5db453 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -46,9 +46,9 @@
 					<van-grid-item text="智能绑卡" url="/pages/message/card-list/index">
 						<van-icon slot="icon" name="/assets/home/icon-card.png" size="76rpx" />
 					</van-grid-item>
-					<van-grid-item text="智能报表" url="/xtends/statics/index/index" wx:if="{{isAdmin}}">
+					<!-- <van-grid-item text="智能报表" url="/xtends/statics/index/index" wx:if="{{isAdmin}}">
 						<van-icon slot="icon" name="/assets/home/icon-report.png" size="76rpx" />
-					</van-grid-item>
+					</van-grid-item> -->
 				</van-grid>
 			</view>
 		</view>
diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js
index 0054f31..4dc3f1c 100644
--- a/pages/process/payment/index.js
+++ b/pages/process/payment/index.js
@@ -25,11 +25,11 @@ Scene({
     orderStatus: null,
     params: {
       settleType: '1',
-      ids: [],
-      payRemark: ''
+      ids: []
     },
     settleType: '1',
-    requesting: false
+    requesting: false,
+    editing: false
   },
   /**
    * 生命周期函数--监听页面加载
@@ -153,8 +153,15 @@ Scene({
       wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` })
     }
   },
+  onRemark: function(e){
+    this.setData({editing: true })
+  },
+  onBlur: function(){
+    this.setData({editing: false })
+  },
   bindInput: function (e) {
-    this.data.params[e.target.id] = e.detail.value
+    var form_data = 'params.' + e.currentTarget.id
+    this.setData({ [form_data]: e.detail.value })
   },
   agentPayment: function(settleType){
     if(Number(settleType) != 1 && Number(settleType) != 2){
@@ -176,7 +183,13 @@ Scene({
     }).catch(err => {
       wx.hideLoading()
       this.data.requesting = false
-      if(err.indexOf('用户未实名') >= 0){
+      if(err.code = 200101){
+        Dialog.confirm({ title: '温馨提示',  message: '该客户注册成为纸通宝用户，才可以使用千鸟代付，现在去注册？' }).then(() => {
+          var cid = this.data.orderList[0].factoryCustomerId
+          wx.navigateTo({ url: '/pages/home/registe/index?id=' + cid })
+        }).catch(err => {
+        })
+      } else if(err.indexOf('用户未实名') >= 0){
         Dialog.confirm({ title: '温馨提示',  message: '您还没有实名认证，无法使用千鸟代付，现在去实名认证？' }).then(() => {
           wx.navigateTo({ url: '/pages/setting/authory/index' })
         }).catch(err => {
diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml
index 1b8dcf7..584eb22 100644
--- a/pages/process/payment/index.wxml
+++ b/pages/process/payment/index.wxml
@@ -37,7 +37,9 @@
     <view class="text-black text-sg">付款备注</view>
   </view>
   <view style="min-height:90rpx;padding: 0rpx 32rpx">
-    <textarea id="payRemark" placeholder-style="color:#aaa" style="width:100%;height:180rpx;padding:12rpx;border:1rpx solid #f3f3f3" placeholder="请输入付款备注" bindinput="bindInput" />
+    <!-- <textarea id="payRemark" placeholder-style="color:#aaa" style="width:100%;height:180rpx;padding:12rpx;border:1rpx solid #f3f3f3" placeholder="请输入付款备注" bindinput="bindInput" /> -->
+    <view class="textarea {{ params.payRemark ? 'text-black' : 'text-gray' }}" bindtap="onRemark" wx:if="{{!editing}}">{{params.payRemark ? params.payRemark : '点击输入付款备注，最多100字' }}</view>
+    <textarea wx:else id="payRemark" maxlength="100" value="{{params.payRemark}}" style="padding-top:16rpx" class="textarea" cursor-spacing="60" focus="{{editing}}" bindfocus="onRemark" bindblur="onBlur" show-confirm-bar="{{false}}" bindinput="bindInput" placeholder-style="color:#aaa" placeholder="点击输入付款备注，最多100字"></textarea>
   </view>
 </view>
 
diff --git a/pages/process/payment/index.wxss b/pages/process/payment/index.wxss
index 4bf77cc..951548d 100644
--- a/pages/process/payment/index.wxss
+++ b/pages/process/payment/index.wxss
@@ -51,4 +51,12 @@ van-dialog__button {
 .van-dialog__confirm {
   border: 0 !important;
   border-radius: 0px;
+}
+
+.textarea{
+  width:100%;
+  height:80px;
+  padding:12rpx;
+  font-size: 14px;
+  border: 1rpx solid #f3f3f3;
 }
\ No newline at end of file