Merge branch 'ren' into develop

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 18:52:15
+ * @LastEditTime: 2019-10-25 09:05:39
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -62,7 +62,7 @@
             <p class="full-name normal">{{ item.bp_name }}</p>
           </div>
           <div class="option">
-            <p class="name">合同租金</p>
+            <p class="name">合同金额</p>
             <p class="normal money">{{ item.total_price | currency }}</p>
             <img src="@/assets/distributorSign/goDetails.png" alt="">
           </div>

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-10-24 15:53:19
+ * @LastEditTime: 2019-10-25 10:00:25
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -197,12 +197,13 @@
       </list-item>
     </h-content>
     <bottom-tab v-if="confirm_status!=='APPROVED'&& (this.$route.params.hasButtom || hasButtomStorage)" class="footer-button">
-      <tab-button class="approve" @click.native="showModalValue=true">
+      <!-- <tab-button class="approve" @click.native="showModalValue=true"> -->
       <!-- <img src="@/assets/intoApproval/approve.png" > -->
+      <tab-button class="approve" @click.native="contractConfirm">
         确认签约
       </tab-button>
     </bottom-tab>
-    <h-modal
+    <!-- <h-modal
       v-if="confirm_status!=='APPROVED'&& (this.$route.params.hasButtom || hasButtomStorage)" ref="modal" v-model="showModalValue" position="bottom">
       <h-view>
         <h-content class="approveContent">
@@ -223,7 +224,7 @@
           </tab-button>
         </bottom-tab>
       </h-view>
-    </h-modal>
+    </h-modal> -->
   </h-view>
 </template>
 
@@ -306,20 +307,40 @@ export default {
   },
   methods:
  {
-   //  topsh () {
-   //    console.log('tops')
-   //    //  confirm('tops')
-   //    this.hlsPopup.showConfirm({
-   //      title: '提示',
-   //      content: '您确认吗？',
-   //      onConfirm: (data) => {
-   //        console.log(data)
-   //        if (data) {
+   // 签约确认
+   contractConfirm () {
+     this.hlsPopup.showConfirm({
+       title: '提示',
+       content: '您确认签约吗？',
+       onConfirm: (data) => {
+         console.log(data)
+         if (data) {
+           let vm = this
+           let url = process.env.basePath + 'do_confrim_bp'
+           let param = {
+             'master': {
+               confirm_id: vm.$route.params.confirm_id,
+               confirm_status: status,
+               confirm_note: vm.confirm_note,
+             },
+           }
+           vm.hlsPopup.showLoading('提交数据中!')
+           vm.hlsHttp.post(url, param).then(function (res) {
+             vm.hlsPopup.hideLoading()
+             if (res.result === 'S') {
+               vm.hlsPopup.showSuccess('签约成功')
+               vm.$router.push({
+                 name: 'ContractList',
+               })
+             } else {
+               vm.hlsPopup.showSuccess(res.message)
+             }
+           })
+         }
+       },
 
-   //        }
-   //      },
-   //    })
-   //  },
+     })
+   },
    // 基本信息
    getBseMsg () {
      let vm = this
@@ -632,7 +653,7 @@ export default {
       font-family: PingFangSC-Semibold;
       font-size: 15px;
       line-height: 20px;
-      letter-spacing: 10px;
+      //letter-spacing: 10px;
       img {
         width: 16.8px;
         height: 16.8px;