纸商城bug、报价bug

pages/client-credit/index.vue

@@ -88,7 +88,8 @@ export default {
       creditType: null,
       searchList: [],
       supplierList: [],
-      hasCreditList: []
+      hasCreditList: [],
+      isFinishedContract: false // 是否该账户与企业签署过担保协议
     }
   },
   onLoad(option) {
@@ -160,7 +161,8 @@ export default {
           enterpriseId: this.form.enterpriseId,
           enterpriseName: target.enterpriseName,
           legalPersonName: target.legalPerson,
-          mallSupplierId: this.form.supplierId
+          mallSupplierId: this.form.supplierId,
+          isFinishedContract: this.isFinishedContract
         })
       }
     },
@@ -189,8 +191,10 @@ export default {
         if (res) {
           res.hasCredit && this.hasCreditList.push('month')
           res.hasFeisuanCredit && this.hasCreditList.push('fs')
+          this.isFinishedContract = res.isFinishedContract
         } else {
           this.hasCreditList = []
+          this.isFinishedContract = false
         }
       })
     }

pages/guarantee-agreement/index.vue

@@ -109,6 +109,7 @@ export default {
        * @value {String} enterpriseName
        * @value {String} legalPersonName
        * @value {String} mallSupplierId
+       * @value {String} isFinishedContract 是否签署过担保协议
        */
       params: null
     }
@@ -160,7 +161,7 @@ export default {
         return
       }
       // 校验是否已签署担保协议
-      if (target.supplier.isFinishedContract) {
+      if (this.isFinishedContract) {
         uni.showToast({
           title: '您已签署过担保协议，即将跳转',
           icon: 'none',
@@ -174,7 +175,7 @@ export default {
       }
       // 校验是否实名认证
       if (target.fddEnterpriseStatus === fddEnterpriseStatus.CERTIFIED_SUCCESS) {
-        getGuaranteeContract({ mallSupplierId: this.params.mallSupplierId }).then((res) => {
+        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 })

pages/mall/index.vue

@@ -256,23 +256,7 @@ export default {
       })
     },
     // 分享
-    shareTap() {
-      uni.share({
-        provider: 'weixin',
-        scene: 'WXSceneSession',
-        type: 0,
-        href: 'http://uniapp.dcloud.io/',
-        title: 'uni-app分享',
-        summary: '我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！',
-        imageUrl: 'https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-uni-app-doc/d8590190-4f28-11eb-b680-7980c8a877b8.png',
-        success: function (res) {
-          console.log('success:' + JSON.stringify(res))
-        },
-        fail: function (err) {
-          console.log('fail:' + JSON.stringify(err))
-        }
-      })
-    }
+    shareTap() {}
   }
 }
 </script>

pages/submit-quotation/index.vue

@@ -100,7 +100,7 @@
       </view>
     </view>
     <uGap></uGap>
-    <view class="submit-btnBg" v-if="upDataObj.replyStatus !== 30102"><button class="submit-btn" type="primary" @click="updataQuery()">提交报价</button></view>
+    <view class="submit-btnBg" v-if="upDataObj.replyStatus !== 30102"><button class="submit-btn" type="primary" @click="updateQuery()">提交报价</button></view>
     <view class="">
       <uni-popup ref="popup" :mask-click="false">
         <view class="submit-popup">
@@ -219,7 +219,7 @@
 import { back, go2 } from '@/utils/hook.js'
 import qnHeader from '@/components/qn-header/qn-header.vue'
 import uGap from '@/components/u-gap/u-gap.vue'
-import { updataEnquiryReply, enquiryReplyDetail } from '@/apis/trade'
+import { updateEnquiryReply, enquiryReplyDetail } from '@/apis/trade'
 
 export default {
   components: {
@@ -429,13 +429,13 @@ export default {
       }
     },
     //提交报价
-    updataQuery() {
+    updateQuery() {
       var params = {
         ...this.upDataObj,
         userId: this.$store.state.userInfo.userId
       }
       return new Promise((resolve, reject) => {
-        updataEnquiryReply(params)
+        updateEnquiryReply(params)
           .then((res) => {
             if (res) {
               uni.showToast({

pages/trade/index.vue

@@ -43,7 +43,6 @@ import notLogged from '@/components/not-logged/not-logged.vue'
 import scrollList from '@/components/scroll-list/scroll-list.vue'
 import quotationList from './quotationList.vue'
 import orderList from './orderList.vue'
-import { gettradingHallList } from '@/apis/trade'
 export default {
   components: { notLogged, scrollList, quotationList, orderList },
   data() {
@@ -55,9 +54,6 @@ export default {
       refresh: false
     }
   },
-  mounted() {
-    // this.getQuotationQurty()
-  },
   onShow() {
     this.refresh = !this.refresh
   },
@@ -68,11 +64,6 @@ export default {
     // 标题选项卡点击事件
     controlChange(value) {
       this.current = value
-      // if (value === '0') {
-      // 	this.getQuotationQurty()
-      // } else {
-      // 	this.getTradingQurty()
-      // }
     }
   }
 }

pages/trade/quotationList.vue

@@ -22,9 +22,9 @@
                 ></image>
               </view>
               <view class="list-info-contant">
-                <view class="list-info-title">{{ subItem.brandName }}</view>
+                <view class="list-info-title">{{ subItem.paperName }}</view>
                 <view class="list-info-text">
-                  {{ subItem.categoryName }}/{{ subItem.paperName }}/{{ subItem.gramWeight }}g/{{ subItem.length }}*{{ subItem.width }}/{{ subItem.quantity }}张
+                  {{ subItem.brandName }}/{{ subItem.categoryName }}/{{ subItem.gramWeight }}g/{{ subItem.length }}*{{ subItem.width }}/{{ subItem.quantity }}张
                 </view>
               </view>
             </view>
@@ -32,7 +32,7 @@
           <view class="list-border list-bottom-contant">
             <view>
               <text>交货时间：</text>
-              <text>{{ item.deliveryDay }}天</text>
+              <text>{{ item.deliveryDay }}</text>
             </view>
             <view>
               <text>交货区域：</text>

utils/hook.js

@@ -20,7 +20,7 @@ export function tab2(tabPage) {
  * @return {null}
  */
 export function back() {
-  if (getCurrentPages().length > 1) {
+  if (getCurrentPages().length > 0) {
     uni.navigateBack({
       delta: 1
     })