优化

ghsApp/src/admin/changePrice/components/Item.vue

@@ -28,7 +28,7 @@
 							<input class="change-input" @click.stop @blur="savePrice" placeholder-style="color:#CCCCCC" v-model="modifyPrice" type="digit" placeholder="花店价" />
 						</view>
 						<view class="sk-price-area">
-							<input class="change-input" @click.stop @blur="saveSkPrice" placeholder-style="color:#CCCCCC" v-model="skModifyPrice" type="digit" placeholder="个人价" />
+							<input class="change-input" @click.stop @blur="saveSkPrice" placeholder-style="color:#CCCCCC" v-model="skModifyPrice" type="digit" placeholder="散客价" />
 						</view>
 					</view>
 				</view>

ghsApp/src/admin/changePrice/list.vue

@@ -139,7 +139,7 @@ export default {
 		},
 		downloadTable(){
 			let level = 0
-			let levelList = ['个人价', '花店价']
+			let levelList = ['散客价', '花店价']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {

ghsApp/src/admin/changePrice/removeList.vue

@@ -169,7 +169,7 @@ export default {
 		},
 		downloadTable(){
 			let level = 0
-			let levelList = ['个人价', '花店价']
+			let levelList = ['散客价', '花店价']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {

ghsApp/src/admin/item/add.vue

@@ -129,7 +129,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">个人价比花店贵</div>
+          <div class="tui-title">散客价比花店贵</div>
           <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -438,7 +438,7 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写个人价比花店贵多少",icon:"none"})
+					uni.showToast({title:"请填写散客价比花店贵多少",icon:"none"})
 					return;
 				}
       }
@@ -503,7 +503,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写个人价比花店贵多少"]
+          msg: ["请填写散客价比花店贵多少"]
         },
         {
           name: "addPrice",

ghsApp/src/admin/item/copy.vue

@@ -129,7 +129,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">个人价比花店贵</view>
+          <view class="tui-title">散客价比花店贵</view>
           <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -434,7 +434,7 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写个人价比花店贵多少",icon:"none"})
+					uni.showToast({title:"请填写散客价比花店贵多少",icon:"none"})
 					return;
 				}
       }
@@ -514,7 +514,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写个人价比花店贵多少"]
+          msg: ["请填写散客价比花店贵多少"]
         },
         {
           name: "weight",

ghsApp/src/admin/item/detail.vue

@@ -132,7 +132,7 @@
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">个人价比花店贵</view>
+            <view class="tui-title">散客价比花店贵</view>
             <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
           </tui-list-cell>
 
@@ -551,7 +551,7 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写个人价比花店贵多少",icon:"none"})
+					uni.showToast({title:"请填写散客价比花店贵多少",icon:"none"})
 					return;
 				}
       }
@@ -631,7 +631,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写个人价比花店贵多少"]
+          msg: ["请填写散客价比花店贵多少"]
         },
         {
           name: "weight",

ghsApp/src/admin/itemClass/addPrice.vue

@@ -5,7 +5,7 @@
 				<t-tr header>
                     <t-th>名称</t-th>
 					<t-th>花店价比成本贵</t-th>
-					<t-th>个人价比花店贵</t-th>
+					<t-th>散客价比花店贵</t-th>
 				</t-tr>
 				<view v-for="(item, index) in list.data" :key="index">
 					<t-tr>
@@ -71,7 +71,7 @@ export default {
 
             this.batchStyle = styleInfo
 			let self = this
-			let levelList = ['请选择列：','个人价比花店贵', '花店价比成本贵']
+			let levelList = ['请选择列：','散客价比花店贵', '花店价比成本贵']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {
@@ -121,7 +121,7 @@ export default {
            this.list.data.forEach(function(value,index,array){
 
                if(that.$util.isMoney(value.skMore) == false){
-                   that.$msg('【'+value.name+'】的 个人价比花店贵 填写错误')
+                   that.$msg('【'+value.name+'】的 散客价比花店贵 填写错误')
                    return false
                }
                if(that.$util.isMoney(value.addPrice) == false){

ghsApp/src/admin/stat/stock.vue

@@ -13,7 +13,7 @@
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th><view style="width:270upx;text-align:left;">花材</view></t-th><t-th>库存</t-th><t-th>花店价</t-th><t-th>个人价</t-th></t-tr>
+						<t-tr header><t-th><view style="width:270upx;text-align:left;">花材</view></t-th><t-th>库存</t-th><t-th>花店价</t-th><t-th>散客价</t-th></t-tr>
 						<block v-if="!$util.isEmpty(classItemData)">
 							<block v-for="(classItem,classIndex) in classItemData" :key="classIndex">
 								<block v-if="classItem.child && !$util.isEmpty(classItem.child)">

ghsApp/src/pagesClient/member/detail.vue

@@ -99,29 +99,29 @@
 						</tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">查看库存权限</div>
+              <div class="tui-title">标记为散客</div>
               <div class="switch_bx">
-                <text v-if="form.showStock == 0">没有</text>
-                <text v-else>有</text>
-                <switch :checked="form.showStock == 0 ? false : true" @change="showStockChangeFn" style="transform: scale(0.8,0.8)" />
+                <text v-if="form.isHd == 1">否</text>
+                <text v-else>是</text>
+                <switch :checked="form.isHd == 1 ? false : true" @change="isHdChangeFn" style="transform: scale(0.8,0.8)" />
               </div>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">花店客户</div>
+              <div class="tui-title">列入黑名单</div>
               <div class="switch_bx">
-                <text v-if="form.isHd == 1">是</text>
-                <text v-else>否</text>
-                <switch :checked="form.isHd == 1 ? true : false" @change="isHdChangeFn" style="transform: scale(0.8,0.8)" />
+                <text v-if="form.black == 1">否</text>
+                <text v-else>是</text>
+                <switch :checked="form.black == 1 ? false : true" @change="blackChangeFn" style="transform: scale(0.8,0.8)" />
               </div>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">列入黑名单</div>
+              <div class="tui-title">查看剩余库存</div>
               <div class="switch_bx">
-                <text v-if="form.black == 1">否</text>
-                <text v-else>是</text>
-                <switch :checked="form.black == 1 ? false : true" @change="blackChangeFn" style="transform: scale(0.8,0.8)" />
+                <text v-if="form.showStock == 0">禁止</text>
+                <text v-else>允许</text>
+                <switch :checked="form.showStock == 0 ? false : true" @change="showStockChangeFn" style="transform: scale(0.8,0.8)" />
               </div>
             </tui-list-cell>
 
@@ -304,7 +304,7 @@ export default {
       })
     },
     isHdChangeFn(e){
-      this.form.isHd = e.detail.value ? 1 : 0;
+      this.form.isHd = e.detail.value ? 0 : 1;
       changeIsHd({ isHd: this.form.isHd, customId: this.userInfo.id }).then(res=>{
         if(res.code == 1){
           this.$msg(res.msg)

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -21,7 +21,7 @@
 		<text class="cg-cost">¥{{res.bigPrice?parseFloat(res.bigPrice):0}}</text>
 		<text class="cost-price">¥{{res.cost?parseFloat(res.cost):0}}</text>
 		<input type="digit" v-model="res.suggestPrice" @focus="clearPrice(i)" @input="linkChange(i)" placeholder="花店价" />
-		<input type="digit" v-model="res.suggestSkPrice" @focus="clearSkPrice(i)" placeholder="个人价" />
+		<input type="digit" v-model="res.suggestSkPrice" @focus="clearSkPrice(i)" placeholder="散客价" />
 	</view>
 </view>
 </view>
@@ -118,7 +118,7 @@ export default {
 				}
 				if(that.$util.isMoney(item.suggestSkPrice) == false){
 					let name = item.name
-					errorHint = '请填写 '+name+' 个人价'
+					errorHint = '请填写 '+name+' 散客价'
 					hasError = true
 				}
 			})