shish 4 lat temu
rodzic
commit
23e914f7cb

+ 1 - 1
ghsApp/src/admin/home/apply.vue

@@ -50,7 +50,7 @@ export default {
                     ]
                     ]
                 },
                 },
                 {
                 {
-                    title:'门店',
+                    title:'客户与门店',
                     list:[
                     list:[
                         {name: "门店",img: `${this.$constant.imgUrl}/ghs/home/shop.png`,url: "/admin/shop/list"},
                         {name: "门店",img: `${this.$constant.imgUrl}/ghs/home/shop.png`,url: "/admin/shop/list"},
                         {name: "员工",img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,url: "/admin/staff/list"},
                         {name: "员工",img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,url: "/admin/staff/list"},

+ 1 - 1
ghsApp/src/admin/home/callback.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 <!-- icondaizhifu -->
 <!-- icondaizhifu -->
 	<appResult :title="'续期成功'">
 	<appResult :title="'续期成功'">
-    <view class="yourAccount">你的号已延长至</view>
+    <view class="yourAccount">你的号已延长至</view>
     <view class="dateLengthen">{{userInfo.deadline}}</view>
     <view class="dateLengthen">{{userInfo.deadline}}</view>
 		<button class="admin-button-com big" @click="back">返回管理中心</button>
 		<button class="admin-button-com big" @click="back">返回管理中心</button>
 	</appResult>
 	</appResult>

+ 3 - 3
ghsApp/src/admin/home/me.vue

@@ -125,7 +125,7 @@
               :hover="false"
               :hover="false"
               :arrow="true"
               :arrow="true"
             >
             >
-              <div class="tui-title">提现号</div>
+              <div class="tui-title">提现号</div>
             </tui-list-cell>
             </tui-list-cell>
 
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expressSet' })" class="line-cell" :hover="false" :arrow="true">
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expressSet' })" class="line-cell" :hover="false" :arrow="true">
@@ -264,11 +264,11 @@ export default {
     },
     },
     checkToApplyCash () {
     checkToApplyCash () {
       let self = this;
       let self = this;
-      //没有设置提现号则提示
+      //没有设置提现号则提示
       if (self.shopInfo.cashAccount == "") {
       if (self.shopInfo.cashAccount == "") {
         uni.showModal({
         uni.showModal({
           title: "提示",
           title: "提示",
-          content: "您还没有设置提现号",
+          content: "您还没有设置提现号",
           confirmText: "去设置",
           confirmText: "去设置",
           success: function (res) {
           success: function (res) {
             if (res.confirm) {
             if (res.confirm) {

+ 1 - 1
ghsApp/src/api/cash/index.js

@@ -1,6 +1,6 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 import https from '@/plugins/luch-request_0.0.7/request'
 
 
-//提现号设置 shish 2021.3.27
+//提现号设置 shish 2021.3.27
 export const cashUpdate = data => {
 export const cashUpdate = data => {
 	return https.get('/shop/cash-update', data)
 	return https.get('/shop/cash-update', data)
 }
 }

+ 1 - 1
ghsApp/src/mixins/globalMixins.js

@@ -126,7 +126,7 @@ export default {
         this.$msg('请输入体验码')
         this.$msg('请输入体验码')
         return false
         return false
       }
       }
-      /**姜枫 2021.04.30  小程序审核体验号**/
+      /**姜枫 2021.04.30  小程序审核体验号**/
       postWxCode({experienceCode: experienceCode}).then(subRes => {
       postWxCode({experienceCode: experienceCode}).then(subRes => {
         if (this.$util.isEmpty(subRes)) {
         if (this.$util.isEmpty(subRes)) {
           return false
           return false

+ 1 - 1
ghsApp/src/pages.json

@@ -77,7 +77,7 @@
 				{"path": "me/incomeExpenses","style": {"navigationBarTitleText": "收支记录"}},
 				{"path": "me/incomeExpenses","style": {"navigationBarTitleText": "收支记录"}},
 				{"path": "me/recharge","style": {"navigationBarTitleText": "充值"}},
 				{"path": "me/recharge","style": {"navigationBarTitleText": "充值"}},
 				{"path": "me/rechargeList","style": {"navigationBarTitleText": "充值记录"}},
 				{"path": "me/rechargeList","style": {"navigationBarTitleText": "充值记录"}},
-				{"path": "me/cashSet","style": {"navigationBarTitleText": "提现号"}},
+				{"path": "me/cashSet","style": {"navigationBarTitleText": "提现号"}},
 				{"path": "me/expressSet","style": {"navigationBarTitleText": "快递设置"}},
 				{"path": "me/expressSet","style": {"navigationBarTitleText": "快递设置"}},
 				{"path": "me/rechargeSuccess","style": {"navigationBarTitleText": "充值成功"}}
 				{"path": "me/rechargeSuccess","style": {"navigationBarTitleText": "充值成功"}}
 			]
 			]

+ 1 - 1
ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -58,7 +58,7 @@
 					<view class="first-area"><text>{{res.name}}</text><input type="digit" v-model="res.autoPrice" @focus="priceFocus(i,res)" @input="modifyPrice(res)"> 元</view>
 					<view class="first-area"><text>{{res.name}}</text><input type="digit" v-model="res.autoPrice" @focus="priceFocus(i,res)" @input="modifyPrice(res)"> 元</view>
 					<view class="second-area">
 					<view class="second-area">
 			                <view class="one" v-if="parseFloat(res.autoPrice)!=parseFloat(Number(res.addPrice)+Number(res.cost)) && parseFloat(Number(res.autoPrice)-Number(res.cost)) > 0">
 			                <view class="one" v-if="parseFloat(res.autoPrice)!=parseFloat(Number(res.addPrice)+Number(res.cost)) && parseFloat(Number(res.autoPrice)-Number(res.cost)) > 0">
-							<label>成本 {{parseFloat(res.cost)}},加价建议改成{{parseFloat(Number(res.autoPrice)-Number(res.cost))}}元,修改请勾选<checkbox :value="res.id" style="transform:scale(0.7)" /> </label>
+							<label>重量 {{parseFloat(res.weight)}} 成本 {{parseFloat(res.cost)}},加价建议{{parseFloat(Number(res.autoPrice)-Number(res.cost))}}元,修改请勾选<checkbox :value="res.id" style="transform:scale(0.7)" /> </label>
 						</view>
 						</view>
 						<view class="two" v-else>成本 {{parseFloat(res.cost)}},加价 {{parseFloat(res.addPrice)}}元</view>
 						<view class="two" v-else>成本 {{parseFloat(res.cost)}},加价 {{parseFloat(res.addPrice)}}元</view>
 					</view>
 					</view>

+ 1 - 1
ghsApp/src/pagesStore/me/cashSet.vue

@@ -88,7 +88,7 @@ export default {
   },
   },
   onShow() {
   onShow() {
     uni.setNavigationBarTitle({
     uni.setNavigationBarTitle({
-      title: `提现号设置`,
+      title: `提现号设置`,
     });
     });
   },
   },
   methods: {
   methods: {

+ 1 - 1
ghsApp/src/utils/tools/validate.js

@@ -3,7 +3,7 @@ const nameReg = /^[\u4E00-\u9FA5A-Za-z]{0,20}$/
 // 手机号
 // 手机号
 // const mobileReg = /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
 // const mobileReg = /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
 const mobileReg = /^(1[3-9])\d{9}$/
 const mobileReg = /^(1[3-9])\d{9}$/
-// 
+// 
 const accountReg = /^[A-Za-z0-9_]{4,10}$/
 const accountReg = /^[A-Za-z0-9_]{4,10}$/
 // 密码
 // 密码
 const pwdReg = /^[A-Za-z0-9]{6,}$/
 const pwdReg = /^[A-Za-z0-9]{6,}$/