Merge branch 'master' into ls

ghsApp/src/admin/home/workbench.vue

@@ -38,8 +38,8 @@
 	<!-- #endif -->
     <view style="width:100vw;height:250upx;display:flex;align-items:center;justify-content:center;position:relative;margin-bottom:170upx;">
 		<button class="admin-button-com big blue" style="width:260upx;" @click="pageTo({url:'/admin/home/login'})">批发店登录</button>
-		<text style="color:green;position:absolute;top:210upx;font-size:33upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">批发店注册</text>
-		<text style="color:green;position:absolute;top:295upx;font-size:33upx;text-decoration: underline;" @click.stop="toPhone()">联系官方技术员</text>
+		<text style="color:green;position:absolute;top:260upx;font-size:40upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">批发店注册</text>
+		<text style="color:green;position:absolute;top:380upx;font-size:40upx;text-decoration: underline;" @click.stop="toPhone()">联系官方客服</text>
     </view>
 
   </block>

ghsApp/src/pagesClient/official/apply.vue

@@ -2,9 +2,14 @@
   <div class="app-content">
     <form @submit="formSubmit">
       <view class="module-com">
-        <view style="font-weight:bold;color:red;padding:20upx 0 20upx 35upx;font-size:30upx;text-align:center;">零售花店请勿注册，否则直接驳回</view>
+        <view style="font-weight:bold;color:red;padding:20upx 0 20upx 35upx;font-size:32upx;text-align:center;">批发店请添加管理员微信
+          <text style="color:#3385FF;text-decoration: underline;" @click="suggest">15280215347</text> 获取邀请码，没有邀请码不能注册。零售花店请勿注册，请勿联系。</view>
       </view>
       <view class="module-com">
+        <tui-list-cell class="line-cell" :hover="false" >
+          <div class="tui-title">邀请码</div>
+          <input v-model="form.inviteCode" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="inviteCode" placeholder="请填写邀请码" />
+        </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false" >
           <div class="tui-title">批发店名</div>
           <input v-model="form.name" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name" placeholder="请输入名称" />
@@ -122,7 +127,8 @@ export default {
         latitude: 11,
         showAddress:"",
         authCode:"",
-        cover:''
+        cover:'',
+        inviteCode:''
       },
       showRegion: false,
       cityPickerValueDefault: [0, 0],
@@ -150,6 +156,17 @@ export default {
 
 	},
   methods: {
+    suggest(){
+      let that = this
+      that.$util.confirmModal({content:'请添加微信号：1528025347',okText:'复制'},() => {
+        uni.setClipboardData({
+          data: '15280215347',
+          success: function() {
+            that.$msg("复制成功")
+          }
+        })
+			})
+    },
 		goToService(){
 			plus.runtime.openURL('http://www.wixhb.com/main/xhb-register')
 		},

hdApp/src/admin/home/workbench.vue

@@ -260,9 +260,9 @@
   </block>
 
   <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 style="margin-right:20upx;">|</text>
-    <text @click="toPhone()">联系技术员</text>
+    <text @click="toPhone()">联系软件公司</text>
   </view>
   </view>
 
@@ -294,7 +294,6 @@ import emptyComponent from "@/components/empty";
 import { ghsList } from "@/api/purchase";
 import { changeDelStatus } from "@/api/ghs";
 import {currentShop} from "@/api/shop";
-import { openPfFn } from "@/api/apply";
 import { clearLogin,hasNotice } from "@/api/admin";
 export default {
   name: "workbench",
@@ -427,7 +426,7 @@ export default {
 			})
     },
     toPhone(){
-			uni.makePhoneCall({ phoneNumber:'15280215347' })
+			this.$util.pageTo({url: '/pagesPurchase/contact'})
 		},
 		showShopName(){
 			currentShop().then(res => {
@@ -448,8 +447,7 @@ export default {
             that.$util.pageTo({url: '/pagesPurchase/pb'})
           }
           if(res.tapIndex == 1){
-            //that.suggest()
-            that.openPfShop2()
+            that.suggest()
           }
           if(res.tapIndex == 2){
             that.$util.pageTo({url:'/pagesPurchase/open'})
@@ -492,18 +490,9 @@ export default {
         })
 			})
     },
-    openPfShop2(){
-			this.$util.confirmModal({content:'确认提交申请？客服将在一个工作日内与您电话联系'},() => {
-        openPfFn().then(res=>{
-          if(res.code == 1){
-            this.$msg(res.msg)
-          }
-        })				
-			})
-    },
     suggest(){
       let that = this
-      that.$util.confirmModal({content:'请添加技术人员微信反馈：15280215347',okText:'复制微信'},() => {
+      that.$util.confirmModal({content:'请添加客服微信反馈：15280215347',okText:'复制微信'},() => {
         uni.setClipboardData({
           data: '15280215347',
           success: function() {

hdApp/src/pages.json

@@ -335,6 +335,7 @@
 		{
 			"root": "admin/recharge",
 			"pages": [
+
 				{ "path": "renew", "style": { "navigationBarTitleText": "免费续期"}},
 				{ "path": "rechargeSuccess", "style": { "navigationBarTitleText": "免费续期"}},
 				{ "path": "discount", "style": { "navigationBarTitleText": "充值优惠"}},
@@ -439,7 +440,7 @@
 				{ "path": "pb", "style": { "navigationBarTitleText": "已屏蔽商家", "enablePullDownRefresh": true } },
 				{ "path": "open", "style": { "navigationBarTitleText": "商城功能开关", "enablePullDownRefresh": true } },
 				{ "path": "shopping", "style": { "navigationBarTitleText": "买花记录", "enablePullDownRefresh": true } },
-				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
+				{ "path": "contact", "style": { "navigationBarTitleText": "联系官方", "enablePullDownRefresh": true } },				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "ghsProduct2", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "setPsd", "style": { "navigationBarTitleText": "设置密码", "enablePullDownRefresh": true } },
 				{ "path": "wechatPay", "style": { "navigationBarTitleText": "待支付"} },

hdApp/src/pagesPurchase/contact.vue

@@ -0,0 +1,70 @@
+<template>
+  <view class="app-content">
+    <view>
+      <view style="font-size:40upx;font-weight:bold;margin-top:10upx;margin-bottom:10upx;">花材的问题，请通过下图地址找商家：</view>
+      <view style="border:1upx solid #CCCCCC;"><image class="logo" :src="`${constant.imgUrl}/shop/contact_shop.png`" alt mode="widthFix" ></image></view>
+    </view>
+    <view style="font-size:40upx;margin-top:50upx;font-weight:bold;">
+      软件问题，系统问题，申请新商城，请联系软件公司，电话：<text @click="suggest" style="color:#3385ff;margin-left:10upx;">15280215347</text>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: "contact",
+  data() {
+    return {
+    };
+  },
+  methods: {
+    init(){
+    },
+    suggest(){
+      let that = this
+      that.$util.confirmModal({content:'号码：15280215347',okText:'复制号码'},() => {
+        uni.setClipboardData({
+          data: '15280215347',
+          success: function() {
+            that.$msg("复制成功")
+          }
+        })
+			})
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+  min-height: calc(100vh - 20upx);
+  padding-top: 20upx;
+  padding-left:10upx;
+  padding-right:10upx;
+}
+.prompt-text {
+  color: $fontColor3;
+  padding-left: 30upx;
+  margin-bottom: 30upx;
+}
+.module-com {
+  margin-bottom: 20upx;
+  .member-wrap {
+    .member-det {
+      font-size: 24upx;
+      margin-left: 20upx;
+    }
+  }
+  .remark-wrap {
+    align-items: flex-start;
+    .remark {
+      height: 240upx;
+    }
+  }
+}
+.confirm-btn {
+  width: calc(100% - 60upx);
+  margin: 60upx 30upx 20upx;
+  .admin-button-com {
+    width: 100%;
+  }
+}
+</style>

hdApp/src/pagesPurchase/gatherPay.vue

@@ -21,6 +21,10 @@
         <block>
           <div class="call-one-btn">
             <block v-if="orderTime>0">
+              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:50upx;color:red;font-weight:bold;">请确认收到花材质量没有问题</view>
+              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;">欠款单付清后，将无法再售后</view>
+              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;">确认没问题，点下方按钮付款</view>
+
               <button class="button-com green pay-wx" @click="wxPayFn(1)" style="height:100upx;line-height:50upx;">微信支付</button>
 
               <!-- #ifdef MP-WEIXIN -->
@@ -163,9 +167,7 @@ export default {
       this.$msg('请用小程序打开，再支付')
       return false
       // #endif
-      that.$util.confirmModal({content:'确认收到花材没有问题？结清后本单无法再售后'},() => {
-        that.confirmWxPayFn()
-      })
+      that.confirmWxPayFn()
     },
     confirmWxPayFn () {
       let that = this
@@ -269,7 +271,7 @@ export default {
       // 使用icon
       .icon {
         .iconfont {
-          font-size: 170upx;
+          font-size: 120upx;
         }
       }
       // 一个按钮

hdApp/src/pagesPurchase/gatherResult.vue

@@ -7,8 +7,14 @@
         <view class="result-title">支付成功</view>
         <button class="admin-button-com big" @click="getDetail()">订单详情</button>
         <button class="admin-button-com big" @click="goBack()" style="margin-top:30upx;">返回</button>
-        <view style="margin-top:60upx;font-size:32upx;" @click="goClearRemind()">如何知道我还有多少待结账？</view>
+        <view style="margin-top:50upx;font-size:36upx;text-decoration:underline;" @click="goClearRemind()">如何查看我还有多少待结账</view>
       </view>
+
+      <!-- #ifdef MP-WEIXIN -->
+      <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
+      <ad-custom unit-id="adunit-b3f48f1b6c1a39ff"></ad-custom>
+      <!-- #endif -->
+
     </view>
   </view>
 </template>
@@ -63,11 +69,11 @@ export default {
     border-radius: 20upx;
     z-index: 1;
     .iconchenggong {
-      font-size: 170upx;
+      font-size: 150upx;
       color: $mainColor1;
     }
     .result-title {
-      margin: 50upx 0 70upx;
+      margin: 40upx 0 60upx;
       font-size: 32upx;
     }
     .close_btn {

hdApp/src/pagesPurchase/open.vue

@@ -3,7 +3,7 @@
     <div>
       <form>
         <div class="module-com input-line-wrap" style="padding:20upx 26upx 0upx 26upx;font-size:32upx;">
-          您正在<text @click="beginChangeCg(0)">开启</text>/<text @click="beginChangeCg(1)">关闭</text>零售店所需的完整功能，包括商城、订单管理、客户管理和财务管理等。
+          您正在<text @click="beginChangeCg(0)">开启</text>/<text @click="beginChangeCg(1)">关闭</text>零售店所需的完整功能，包括商城、订单管理、客户管理和<text @click="openPfShop2()">财务</text>管理等。
         </div>
         <div class="confirm-btn">
           <button class="admin-button-com big blue" @click="changeCg(0)"> 开启 </button>
@@ -15,6 +15,7 @@
 </template>
 <script>
 import { changeOnlyCg } from "@/api/shop";
+import { openPfFn } from "@/api/apply";
 export default {
   name: "open",
   data() {
@@ -24,6 +25,15 @@ export default {
   methods: {
     init(){
 
+    },
+    openPfShop2(){
+        uni.showLoading({mask:false})
+        openPfFn().then(res=>{
+          uni.hideLoading()
+          if(res.code == 1){
+            this.$msg(res.msg)
+          }
+        })
     },
     beginChangeCg(num){
       let that = this

hdApp/src/pagesPurchase/wechatPay.vue

@@ -426,7 +426,7 @@ export default {
           padding-top:26upx;
           padding-bottom:26upx;
           font-size: 32upx;
-          margin-top:28upx;
+          margin-top:50upx;
         }
       }
     }