支付和logo

enums/index.js

@@ -3,7 +3,7 @@ const urlEnv = env === 'production' ? '' : `-${env}`
 
 export const XAPPID = '503258978847966403'
 
-export const H5_URL = `http://shopkeeper${env === 'production' ? '' : '.' + env}.qniao.cn`
+export const H5_URL = `https://shopkeeper${urlEnv}.qniao.cn`
 
 export const H5_URL_STORE = `${H5_URL}/#/pages/store/index?share=true&`
 export const H5_URL_PAPER = `${H5_URL}/#/pages/paper-details/index?share=true&`
@@ -19,7 +19,7 @@ export const accountType = {
   PHONE: 2,
   EMAIL: 3,
   APPLEID: 4,
-  CUSTOM: 5,
+  CUSTOM: 5
 }
 
 /**
@@ -30,7 +30,7 @@ export const codePurpose = {
   RESET_LOGIN_PASSWORD: 2,
   RESET_PHONE: 3,
   BIND_BANK_CARD: 4,
-  RESET_CREDIT_PASSWORD: 5,
+  RESET_CREDIT_PASSWORD: 5
 }
 
 /**
@@ -38,7 +38,7 @@ export const codePurpose = {
  */
 export const verificationType = {
   PHONE: 1,
-  EMAIL: 2,
+  EMAIL: 2
 }
 /**
  * 法大大企业认证状态 1:未认证 2:认证中 3:已认证 4:认证失败
@@ -47,14 +47,14 @@ export const fddEnterpriseStatus = {
   UNCERTIFIED: 1,
   CERTIFIED_ING: 2,
   CERTIFIED_SUCCESS: 3,
-  CERTIFIED_FAIL: 4,
+  CERTIFIED_FAIL: 4
 }
 /**
  * 上传地址
  */
 export const uploadUrl = {
   image: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/image`,
-  file: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file`,
+  file: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file`
 }
 /**
  * 结算周期：1：月结30（飞算1期），2：月结45，3：月结60（飞算2期），4：月结75，5：月结90（飞算3期）
@@ -62,24 +62,24 @@ export const uploadUrl = {
 export const settlementPeriodEnum = [
   {
     value: 1,
-    label: '月结30',
+    label: '月结30'
   },
   {
     value: 2,
-    label: '月结45',
+    label: '月结45'
   },
   {
     value: 3,
-    label: '月结60',
+    label: '月结60'
   },
   {
     value: 4,
-    label: '月结75',
+    label: '月结75'
   },
   {
     value: 5,
-    label: '月结90',
-  },
+    label: '月结90'
+  }
 ]
 /**
  * 结算周期：1：1期，2：2期，3：3期
@@ -87,16 +87,16 @@ export const settlementPeriodEnum = [
 export const fsSettlementPeriodEnum = [
   {
     value: 1,
-    label: '1期',
+    label: '1期'
   },
   {
     value: 2,
-    label: '2期',
+    label: '2期'
   },
   {
     value: 3,
-    label: '3期',
-  },
+    label: '3期'
+  }
 ]
 /**
  * 飞算结算方式： 1: 先息后本
@@ -104,8 +104,8 @@ export const fsSettlementPeriodEnum = [
 export const fsSettlementMethodEnum = [
   {
     value: 1,
-    label: '先息后本',
-  },
+    label: '先息后本'
+  }
 ]
 
 /**
@@ -115,7 +115,7 @@ export const fsAuditStatus = {
   WAIT_APPLY: 0,
   AUDITING: 1,
   PASS: 2,
-  REJECT: 3,
+  REJECT: 3
 }
 
 /**
@@ -133,7 +133,7 @@ export const supplierOrderStatusEnum = {
   FINISHED: 30213,
   WAIT_CLIENT_REPAY: 30217,
   REPAYING: 30216,
-  CANCELED: 30212,
+  CANCELED: 30212
 }
 /**
  * 供应商订单状态 待客户确认订单/30202,待供应商确认订单/30205,待发货/30106,已发货/30107 ,待客户借款/30207,支付中/30208,待客户支付/30214,付款失败/30211,已完成/30213,待客户还款/30217,已取消/30212,还款中/30216
@@ -150,7 +150,7 @@ export const supplierOrderStatusMap = {
   [supplierOrderStatusEnum.FINISHED]: '已完成',
   [supplierOrderStatusEnum.WAIT_CLIENT_REPAY]: '待客户还款',
   [supplierOrderStatusEnum.REPAYING]: '还款中',
-  [supplierOrderStatusEnum.CANCELED]: '已取消',
+  [supplierOrderStatusEnum.CANCELED]: '已取消'
 }
 
 /**
@@ -159,13 +159,13 @@ export const supplierOrderStatusMap = {
 export const paymentMethodEnum = {
   WECHAT_PAY: 1,
   MONTHLY_PAY: 2,
-  FLY_PAY: 4,
+  FLY_PAY: 4
 }
 
 export const paymentMethodMap = {
   [paymentMethodEnum.WECHAT_PAY]: '微信支付',
   [paymentMethodEnum.MONTHLY_PAY]: '月结支付',
-  [paymentMethodEnum.FLY_PAY]: '飞算支付',
+  [paymentMethodEnum.FLY_PAY]: '飞算支付'
 }
 
 /**
@@ -175,7 +175,7 @@ export const financeStatusEnum = {
   WAIT_CLIENT_LOAN: 30181,
   WAIT_FINANCE: 30182,
   FINISHED: 30183,
-  FAILED: 30184,
+  FAILED: 30184
 }
 
 /**
@@ -185,7 +185,7 @@ export const financeStatusMap = {
   [financeStatusEnum.WAIT_CLIENT_LOAN]: '待客户借款',
   [financeStatusEnum.WAIT_FINANCE]: '待融资',
   [financeStatusEnum.FINISHED]: '已融资',
-  [financeStatusEnum.FAILED]: '融资失败',
+  [financeStatusEnum.FAILED]: '融资失败'
 }
 
 /**
@@ -193,10 +193,10 @@ export const financeStatusMap = {
  */
 export const contractTypeEnum = {
   ORDER_CONTRACT: 1,
-  GUARANTEE_CONTRACT: 2,
+  GUARANTEE_CONTRACT: 2
 }
 
 export const contractTypeMap = {
   [contractTypeEnum.ORDER_CONTRACT]: '订单合同',
-  [contractTypeEnum.GUARANTEE_CONTRACT]: '担保合同',
+  [contractTypeEnum.GUARANTEE_CONTRACT]: '担保合同'
 }

pages/client-credit/index.vue

@@ -89,7 +89,8 @@ export default {
       searchList: [],
       supplierList: [],
       hasCreditList: [],
-      isFinishedContract: false // 是否该账户与企业签署过担保协议
+      isFinishedContract: false, // 是否该账户与企业签署过担保协议
+      timer: null
     }
   },
   onLoad(option) {
@@ -105,6 +106,12 @@ export default {
       }
     }
   },
+  onShow() {
+    if (this.form.enterpriseId && this.form.supplierId) {
+      console.log('onshow 获取授信信息')
+      this.getCreditList({ mallSupplierId: this.form.supplierId, customerEnterpriseId: this.form.enterpriseId })
+    }
+  },
   methods: {
     back,
     showCompany(e) {
@@ -192,17 +199,23 @@ export default {
       this.creditType = creditType
     },
     getCreditList(data) {
-      getCustomerCreditInfo(data).then((res) => {
-        if (res) {
-          this.hasCreditList = []
-          res.hasCredit && this.hasCreditList.push('month')
-          res.hasFeisuanCredit && this.hasCreditList.push('fs')
-          this.isFinishedContract = res.isFinishedContract
-        } else {
-          this.hasCreditList = []
-          this.isFinishedContract = false
-        }
-      })
+      if (this.timer) {
+        clearTimeout(this.timer)
+        this.timer = null
+      }
+      this.timer = setTimeout(() => {
+        getCustomerCreditInfo(data).then((res) => {
+          if (res) {
+            this.hasCreditList = []
+            res.hasCredit && this.hasCreditList.push('month')
+            res.hasFeisuanCredit && this.hasCreditList.push('fs')
+            this.isFinishedContract = res.isFinishedContract
+          } else {
+            this.hasCreditList = []
+            this.isFinishedContract = false
+          }
+        })
+      }, 500)
     }
   },
   created() {
@@ -227,7 +240,6 @@ export default {
       }
     },
     ['form.enterpriseId']() {
-      console.log('form.enterpriseId', this.form)
       if (this.form.enterpriseId && this.form.supplierId) {
         this.getCreditList({ mallSupplierId: this.form.supplierId, customerEnterpriseId: this.form.enterpriseId })
       }

pages/client-list/index.vue

@@ -147,20 +147,12 @@ export default {
       return this.$store.state.qnToken != ''
     }
   },
-  mounted() {
-    // getArea().then((res) => {
-    //   if (res) {
-    //     this.items = res
-    //   }
-    // })
-  },
   onLoad(option) {
     if (option) {
       option.latitude && (this.params.latitude = option.latitude)
       option.longitude && (this.params.longitude = option.longitude)
       option.km && (this.params.km = option.km)
     }
-    // this.getList()
   }
 }
 </script>

pages/guarantee-agreement/index.vue

@@ -180,7 +180,7 @@ export default {
         getGuaranteeContract({ mallSupplierId: this.params.mallSupplierId, customerEnterpriseId: this.params.enterpriseId }).then((res) => {
           if (res) {
             // #ifdef APP-PLUS
-            go2('page-view', { title: '签约担保协议', url: encodeURIComponent(res), params: this.params })
+            go2('page-view', { title: '签约担保协议', url: encodeURIComponent(res), params: JSON.stringify(this.params) }, true)
             // #endif
             // #ifdef H5
             window ? (window.location.href = res) : ''

pages/mall/index.vue

@@ -6,7 +6,7 @@
         <view slot="right" class="right-title" @tap="shareTap">分享</view>
       </uni-nav-bar>
       <view class="top-box" :style="backgroundStyle">
-        <view class=""><image class="image" :src="logo" mode=""></image></view>
+        <view><image class="image" :src="logo" mode=""></image></view>
         <view class="center">
           <view class="title">{{ storeInformation.name }}</view>
           <view class="desc">全部商品 {{ storeInformation.productNumber }} &nbsp; | &nbsp;上新 {{ storeInformation.currentProductNumber }}</view>
@@ -28,10 +28,10 @@
                 :src="item.litPicUrl || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
                 mode=""
               ></image>
-              <view class="" style="width: 100%">
+              <view style="flex: 1 1 auto">
                 <view class="title">
-                  <view class="">{{ item.name }}</view>
-                  <view class="">
+                  <view>{{ item.name }}</view>
+                  <view>
                     <image
                       class="icon"
                       :src="item.status === 30111 ? '/static/imgs/mall/grounding-icon.png' : '/static/imgs/mall/sold-out-icon.png'"
@@ -49,9 +49,9 @@
             <view class="other">
               <view class="time">{{ item.updateTime | timeFilter }}</view>
               <view class="btn">
-                <view class="" @click="editPaper(item)" v-if="item.status === 30112">编辑</view>
+                <view @click="editPaper(item)" v-if="item.status === 30112">编辑</view>
                 <view class="divide"></view>
-                <view class="" @click="productStatusChange(item)">{{ item.status === 30111 ? '下架' : '上架' }}</view>
+                <view @click="productStatusChange(item)">{{ item.status === 30111 ? '下架' : '上架' }}</view>
               </view>
             </view>
           </view>
@@ -71,7 +71,7 @@
       <view v-show="hasLogin && !hasCompany" class="flex-col-center-center" style="margin-top: 100rpx">
         <text style="font-size: 30rpx; text-align: center; font-weight: 600">请先完善企业基本信息</text>
       </view>
-      <view class="" v-show="!hasLogin"><not-logged @loginChange="loginChange()"></not-logged></view>
+      <view v-show="!hasLogin"><not-logged @loginChange="loginChange()"></not-logged></view>
     </view>
     <view class="flex-col section_4" v-show="visible">
       <image src="/static/imgs/mall/close-icon.png" class="image_9" @click="closeShare" />

pages/month-credit/index.vue

@@ -70,7 +70,7 @@ export default {
             duration: 2000,
             success: () => {
               setTimeout(() => {
-                go2('client-credit', {}, true)
+                go2('client-credit', { enterpriseId: this.form.enterpriseId, name: this.form.enterpriseName }, true)
               }, 2000)
             }
           })

pages/page-view/index.vue

@@ -11,13 +11,15 @@ export default {
   data() {
     return {
       url: '',
-      socket: null
+      socket: null,
+      params: null
     }
   },
   onLoad(option) {
     if (option) {
       this.url = decodeURIComponent(option.url)
-      console.log(this.url, option)
+      this.params = JSON.parse(option.params)
+      console.log('params', option.params)
     } else {
       uni.showToast({
         title: '参数错误',
@@ -41,6 +43,11 @@ export default {
      * @param {Object} data {data:{},type:''}
      */
     getMessage(data) {
+      // 供应商担保协议回调
+      if (data.type === 'guaranteeSuccess') {
+        go2('fs-credit', { ...this.params }, true)
+      }
+      // 订单合同签署成功
       if (data.type == 'zzgSupplierTCSignSuccess') {
         go2('order-detail', { orderId: data.data.orderId }, true)
       }

pages/vip-center/index.vue

@@ -16,37 +16,25 @@
             <view class="flex-row equal-division">
               <view class="equal-division-item flex-col">
                 <view class="top-image-wrapper flex-col items-center">
-                  <image
-                    src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16456699126307827649.png"
-                    class="image_4"
-                  />
+                  <image src="/static/imgs/vip-center/1.png" class="image_4" />
                 </view>
                 <text class="text_8">账期变现</text>
               </view>
               <view class="equal-division-item flex-col group_10">
                 <view class="top-image-wrapper flex-col items-center">
-                  <image
-                    src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16456699126326656192.png"
-                    class="image_4"
-                  />
+                  <image src="/static/imgs/vip-center/2.png" class="image_4" />
                 </view>
                 <text class="text_8">电子签约</text>
               </view>
               <view class="equal-division-item_1 flex-col">
                 <view class="flex-col items-center image-wrapper">
-                  <image
-                    src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16456699126346194649.png"
-                    class="image_7"
-                  />
+                  <image src="/static/imgs/vip-center/3.png" class="image_7" />
                 </view>
                 <text class="text_11">智能合同</text>
               </view>
               <view class="equal-division-item_1 flex-col">
                 <view class="top-image-wrapper flex-col items-center">
-                  <image
-                    src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16456699133425037124.png"
-                    class="image_4"
-                  />
+                  <image src="/static/imgs/vip-center/4.png" class="image_4" />
                 </view>
                 <text class="text_11">征信管理</text>
               </view>
@@ -69,12 +57,12 @@
   </view>
 </template>
 <script>
-import { back } from '@/utils/hook.js'
+import { back, go2 } from '@/utils/hook.js'
 import { openVip, openVipPay } from '@/apis/commonApi.js'
 export default {
   data() {
     return {
-      money: 10000,
+      money: 10000
     }
   },
   methods: {
@@ -82,12 +70,12 @@ export default {
     payForVip() {
       openVip({
         mallSupplierId: this.$store.state.supplierInfo.supplierId,
-        type: 1, // 年费
+        type: 1 // 年费
       }).then((res) => {
         if (res) {
           openVipPay({
             tradeOrderId: res.orderId,
-            channelId: res.channelId,
+            channelId: res.channelId
           }).then((info) => {
             if (info) {
               console.log('info', info)
@@ -98,26 +86,27 @@ export default {
                   uni.showToast({
                     title: '支付成功',
                     icon: 'none',
-                    duration: 1500,
+                    duration: 1500
                   })
                   setTimeout(() => {
                     go2('mine', {}, true)
                   }, 1500)
                 },
                 fail: (err) => {
+                  console.log('err', err)
                   uni.showToast({
                     title: '支付失败',
                     icon: 'none',
-                    duration: 1500,
+                    duration: 1500
                   })
-                },
+                }
               })
             }
           })
         }
       })
-    },
-  },
+    }
+  }
 }
 </script>