shish há 2 anos atrás
pai
commit
950f1eb1cb

+ 1 - 1
ghsApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
+    "apiHost": "http://api.shop.hzghd.com",
     "socketApiHost": "api.shop.hzghd.com",
     "imgHost": "https://img.hzghd.com",
     "name":"花掌柜"

+ 24 - 5
hdApp/src/admin/home/workbench.vue

@@ -172,6 +172,19 @@
             <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>欠款变动记录</text> </view>
             <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
             <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping'})"> <text>买花记录</text> </view>
+            <view class="tag_2" @click.stop="callUp(ghsInfo.telephone)" style="color:green;font-weight:bold;"> <text>联系我们</text> </view>
+          </view>
+          <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>0" @click.stop="whyHave()">
+            <view class="show_clear_area flex-row justify-between">
+              <image class="icon_2" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps2pvfa1l5i34w5vqj2k7b3kejml3i3nmrba1421bf-caa2-491b-8773-af413df7e96d.png" />
+              <text class="waite_clear_order">
+                可用余额&nbsp;¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}
+              </text>
+            </view>
+            <view class="image-text_9 flex-row justify-between">
+              <text class="text-group_4"></text>
+              <image referrerpolicy="no-referrer" :src="`${constant.imgUrl}/ghs/why2.png`" style="width:33upx;height:31upx;" />
+            </view>
           </view>
           <view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0">
             <view class="show_clear_area flex-row justify-between">
@@ -190,7 +203,7 @@
           <block v-else>
             <view class="button_6 flex-col" @click="fillCg(ghsInfo)"><text class="text_13">录采购单</text></view>
           </block>
-          <text style="position:absolute;left:646upx;top:235upx;color:#CCCCCC;" @click.stop="bpSj(ghsInfo)">屏蔽</text>
+          <text style="position:absolute;left:725upx;top:0upx;color:#CCCCCC;" @click.stop="bpSj(ghsInfo)">x</text>
         </view>
     </view>
 
@@ -201,7 +214,7 @@
   <view style="text-align:center;margin-top:50upx;margin-bottom:182upx;color:#827171;font-size:28upx;">
     <text style="margin-right:20upx;">中花汇提供技术支持</text>
     <text style="margin-right:20upx;">|</text>
-    <text @click="toPhone()">联系中花汇</text>
+    <text @click="toPhone()">联系技术员</text>
   </view>
   </view>
 
@@ -321,6 +334,9 @@ export default {
 
   },
   methods: {
+    callUp (mobile) {
+      uni.makePhoneCall({ phoneNumber: mobile })
+    },
     toPhone(){
 			uni.makePhoneCall({ phoneNumber:'15280215347' })
 		},
@@ -395,7 +411,7 @@ export default {
     },
     bpSj(ghs){
       let that = this
-      that.$util.confirmModal({content:'确认屏蔽此商家?',okText:'确认'},() => {
+      that.$util.confirmModal({content:'确认删除此商家?',okText:'确认'},() => {
         that.confirmPb(ghs)
 			})
     },
@@ -426,6 +442,9 @@ export default {
       }
       that.pageTo({url: '/pagesPurchase/ghsProduct2?id='+item.id})
     },
+    whyHave(){
+      this.$util.confirmModal({content:'因结账金额不足抵扣最早那张欠款单,所以留存余额'},() => {})
+    },
     settleAccounts (item) {
       this.pageTo({ url: '/pagesPurchase/gathering?id='+item.id})
     },
@@ -866,7 +885,7 @@ export default {
       .box_9 {
         width: 100%;
         height: 60upx;
-        margin: 23upx 0 22upx 30upx;
+        margin: 23upx 0 22upx 15upx;
         .tag_2 {
           background-color: rgba(255, 255, 255, 1);
           border-radius: 8px;
@@ -875,7 +894,7 @@ export default {
           border: 2px solid rgba(221, 221, 221, 1);
           color: rgba(51, 51, 51, 1);
           font-size: 30upx;
-          margin:0 25upx 0 0;
+          margin:0 16upx 0 0;
           text-align:center;
           float:left;
           padding-left:15upx;

+ 1 - 1
hdApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
+    "apiHost": "http://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
     "imgHost": "https://img.huaml.com",
     "name":"花美玲"

+ 24 - 6
hdApp/src/pagesPurchase/order.vue

@@ -37,7 +37,19 @@
                 <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>欠款变动记录</text> </view>
                 <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
                 <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping'})"> <text>买花记录</text> </view>
-                
+                <view class="tag_2" @click.stop="callUp(ghsInfo.telephone)" style="color:green;font-weight:bold;"> <text>联系我们</text> </view>
+              </view>
+              <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>0" @click.stop="whyHave()">
+                <view class="show_clear_area flex-row justify-between">
+                  <image class="icon_2" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps2pvfa1l5i34w5vqj2k7b3kejml3i3nmrba1421bf-caa2-491b-8773-af413df7e96d.png" />
+                  <text class="waite_clear_order">
+                    可用余额&nbsp;¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}
+                  </text>
+                </view>
+                <view class="image-text_9 flex-row justify-between">
+                  <text class="text-group_4"></text>
+                  <image referrerpolicy="no-referrer" :src="`${constant.imgUrl}/ghs/why2.png`" style="width:33upx;height:31upx;" />
+                </view>
               </view>
               <view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0">
                 <view class="show_clear_area flex-row justify-between">
@@ -56,14 +68,14 @@
               <block v-else>
                 <view class="button_6 flex-col" @click="fillCg(ghsInfo)"><text class="text_13">录采购单</text></view>
               </block>
-              <text style="position:absolute;left:646upx;top:235upx;color:#CCCCCC;" @click.stop="bpSj(ghsInfo)">屏蔽</text>
+              <text style="position:absolute;left:725upx;top:0upx;color:#CCCCCC;" @click.stop="bpSj(ghsInfo)">x</text>
             </view>
         </view>
 
         <view style="text-align:center;margin-top:50upx;margin-bottom:182upx;color:#827171;font-size:28upx;">
           <text style="margin-right:20upx;">中花汇提供技术支持</text>
           <text style="margin-right:20upx;">|</text>
-          <text @click="toPhone()">联系中花汇</text>
+          <text @click="toPhone()">联系技术员</text>
         </view>
 
       <view class="app-footer open_btn">
@@ -97,6 +109,9 @@ export default {
     ...mapGetters({ dictInfo:"getDictionariesInfo" })
   },
   methods: {
+    callUp (mobile) {
+      uni.makePhoneCall({ phoneNumber: mobile })
+    },
     toPhone(){
 			uni.makePhoneCall({ phoneNumber:'15280215347' })
 		},
@@ -120,7 +135,7 @@ export default {
     },
     bpSj(ghs){
       let that = this
-      that.$util.confirmModal({content:'确认屏蔽此商家?',okText:'确认'},() => {
+      that.$util.confirmModal({content:'确认删除此商家?',okText:'确认'},() => {
         that.confirmPb(ghs)
 			})
     },
@@ -143,6 +158,9 @@ export default {
       }
       that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
     },
+    whyHave(){
+      this.$util.confirmModal({content:'因结账金额不足抵扣最早那张欠款单,所以留存余额'},() => {})
+    },
     init() {
       this.getGHSList()
     },
@@ -314,7 +332,7 @@ export default {
       .box_9 {
         width: 100%;
         height: 60upx;
-        margin: 23upx 0 22upx 30upx;
+        margin: 23upx 0 22upx 15upx;
         .tag_2 {
           background-color: rgba(255, 255, 255, 1);
           border-radius: 8px;
@@ -323,7 +341,7 @@ export default {
           border: 2px solid rgba(221, 221, 221, 1);
           color: rgba(51, 51, 51, 1);
           font-size: 30upx;
-          margin:0 25upx 0 0;
+          margin:0 16upx 0 0;
           text-align:center;
           float:left;
           padding-left:15upx;