From 1231351d2999e59b08a6bc5e83dee70885e9b509 Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Mon, 10 Jul 2023 13:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=BC=80=E9=80=9A=E4=BF=A1?=
 =?UTF-8?q?=E7=94=A8=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json              |  6 +++---
 pages/product/basicSet.vue | 42 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6656750..4499fe8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
 {
-    "name" : "CRMEB",
+    "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.0.15",
-    "versionCode" : 138,
+    "versionName" : "1.0.17",
+    "versionCode" : 140,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 78d6273..e0ce65f 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -128,7 +128,18 @@
       </view>
 	  <view class="item_cell flex_a_c">
         <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>开启先货后款：</view>
+        <u-switch v-model="credit_buy" @change="change"></u-switch>
       </view>
+      <view class="item_cell flex_a_c">
+          <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view>
+          <input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天">
+        </view>
+        <view class="remarks">*周期结算时间范围为:15~100  周期单位为:天</view>
+        <view class="item_cell flex_a_c">
+            <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
+             <input type="number" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
+          </view>
+          <view class="remarks">*利率结算范围为:0.035 ~ 0.01    利率单位为:%</view>
       <!-- <view class="item_cell">
         <view class="if_btn flex_a_c_j_sb">
           <text class="sub_title">是否开启商户：</text>
@@ -227,7 +238,10 @@
         overTimeShow: false,
         mer_address: '',
         id: '',
-        mer_certificate: ''
+        mer_certificate: '',
+        credit_buy:0,//开启信用购
+        interest_rate:'',//利率
+        settle_cycle:'',//周期
       }
     },
     onLoad(e) {
@@ -261,6 +275,18 @@
           this.servicePhone = res.data.service_phone
           this.mer_address = res.data.mer_address
           this.merState = res.data.mer_state === 1 ? true : false
+          this.credit_buy = res.data.credit_buy
+          if( res.data.settle_cycle == 0){
+            this.settle_cycle=''
+          }else{
+            this.settle_cycle=res.data.settle_cycle
+          }
+          if( res.data.interest_rate == 0){
+            this.interest_rate=''
+          }else{
+            this.interest_rate=res.data.interest_rate
+          }
+
           // console.log('res', res.data);
         }).catch(err => {
           // console.log('err', err);
@@ -269,6 +295,10 @@
       checkboxChange(val) {
         this.delivery_way = val.detail.value
       },
+      //开启信用购
+      change(e){
+        console.log(e);
+      },
       // 上传店铺背景
       sel(item, i) {
         if (item.isCheck == false) {
@@ -311,7 +341,10 @@
           mer_state: this.merState ? '1' : '0',
           type: '2',
           uploadedqualifications: '',
-          id: this.id
+          id: this.id,
+          credit_buy:this.credit_buy,
+          settle_cycle:this.settle_cycle,
+          interest_rate:this.interest_rate
         }
         merchantUpdateAPI(data).then(res => {
           Toast(res.message)
@@ -557,6 +590,11 @@
     font-size: 24.56rpx;
     color: #CCCCCC;
   }
+  .remarks{
+    margin-left:20px ;
+    font-size: 24.56rpx;
+    color: #CCCCCC;
+  }
 
   .long_lat {
     margin: 31.58rpx 0;