shish 4 лет назад
Родитель
Сommit
b449ff3246

+ 5 - 4
ghsApp/src/admin/changePrice/components/Item.vue

@@ -25,10 +25,9 @@
 		</view>
 	</view>
 	<view class="level-price">
-		散客 ¥<text style="margin-right:30upx;">{{skPrice}}</text>
-		普店 ¥<text style="margin-right:30upx;">{{pdPrice}}</text>
-		银店 ¥<text style="margin-right:30upx;">{{ydPrice}}</text>
-		金店 ¥<text style="margin-right:8upx;">{{jdPrice}}</text>
+		<text>散客 ¥{{skPrice}}</text>
+		<text>花店 ¥{{pdPrice}}</text>
+		<text>同行 ¥{{ydPrice}}</text>
 	</view>
 </view>
 </template>
@@ -96,9 +95,11 @@ export default {
 .product{
 	height:230upx;
 	.level-price{
+		display:flex;
 		color:#999999;
 		text-align: right;
 		font-size:22upx;
+		justify-content:space-around;
 	}
 }
 .item-cmd_bx {

+ 1 - 1
ghsApp/src/admin/changePrice/list.vue

@@ -93,7 +93,7 @@ export default {
 	methods: {
 		downloadTable(){
 			let level = 0
-			let levelList = ['散客价', '普店价', '银店价','金店价']
+			let levelList = ['散客价', '花店价', '同行价']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {

+ 4 - 19
ghsApp/src/admin/item/detail.vue

@@ -55,17 +55,13 @@
           <input v-model="form.skAddPrice" placeholder-class="phcolor" class="tui-input" name="skAddPrice" @focus="form.skAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </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.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </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.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" @focus="form.hjAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">金店加价</view>
-          <input v-model="form.zsAddPrice" placeholder-class="phcolor" class="tui-input" name="zsAddPrice" @focus="form.zsAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
-        </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="false">
           <view class="tui-title">大单位</view>
@@ -172,7 +168,6 @@ export default {
         skAddPrice:'',
         addPrice:'',
         hjAddPrice:'',
-        zsAddPrice:'',
         discountPrice:'',
         weight:'',
         cover:[],
@@ -284,7 +279,6 @@ export default {
         this.form.skAddPrice =''
         this.form.addPrice =''
         this.form.hjAddPrice =''
-        this.form.zsAddPrice =''
         this.form.discountPrice = ''
       })
     },
@@ -397,11 +391,7 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.hjAddPrice) == false){
-					uni.showToast({title:"请填写银店加价",icon:"none"})
-					return;
-				}
-				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.zsAddPrice) == false){
-					uni.showToast({title:"请填写金店加价",icon:"none"})
+					uni.showToast({title:"请填写同行加价",icon:"none"})
 					return;
 				}
       }
@@ -481,12 +471,7 @@ export default {
         {
           name: "hjAddPrice",
           rule: ["required"],
-          msg: ["请填写银店加价"]
-        },
-        {
-          name: "zsAddPrice",
-          rule: ["required"],
-          msg: ["请填写金店加价"]
+          msg: ["请填写同行加价"]
         },
         {
           name: "discountPrice",

+ 7 - 18
ghsApp/src/admin/itemClass/addPrice.vue

@@ -5,9 +5,8 @@
 				<t-tr header>
                     <t-th>名称</t-th>
 					<t-th>散客</t-th>
-					<t-th>普店</t-th>
-					<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>
@@ -20,9 +19,6 @@
                             </t-td>
 						<t-td align="center" color="info">
                             <view><input v-model="item.hjAddPrice" @focus="item.hjAddPrice=''" name="hjAddPrice" type="digit" style="border:1upx solid #cccccc;" /></view>
-                            </t-td>
-						<t-td align="center" color="info">
-                            <view><input v-model="item.zsAddPrice" @focus="item.zsAddPrice=''" name="zsAddPrice" type="digit" style="border:1upx solid #cccccc;" /></view>
                             </t-td>
 					</t-tr>
 				</view>
@@ -80,7 +76,7 @@ export default {
 
             this.batchStyle = styleInfo
 			let self = this
-			let levelList = ['请选择列:','散客', '普店', '银店', '金店']
+			let levelList = ['请选择列:','散客', '花店', '同行']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {
@@ -108,8 +104,6 @@ export default {
                             array[index].addPrice =  parseFloat((Number(array[index].addPrice) + currentPrice).toFixed(2))
                         }else if(that.levelIndex == 3){
                             array[index].hjAddPrice =  parseFloat((Number(array[index].hjAddPrice) + currentPrice).toFixed(2))
-                        }else if(that.levelIndex == 4){
-                            array[index].zsAddPrice =  parseFloat((Number(array[index].zsAddPrice) + currentPrice).toFixed(2))
                         }else{
 
                         }
@@ -120,8 +114,6 @@ export default {
                             array[index].addPrice =  parseFloat((currentPrice).toFixed(2))
                         }else if(that.levelIndex == 3){
                             array[index].hjAddPrice =  parseFloat((currentPrice).toFixed(2))
-                        }else if(that.levelIndex == 4){
-                            array[index].zsAddPrice =  parseFloat((currentPrice).toFixed(2))
                         }else{
 
                         }
@@ -142,18 +134,15 @@ export default {
                    return false
                }
                if(that.$util.isMoney(value.addPrice) == false){
-                   that.$msg('【'+value.name+'】的店加价填写错误')
+                   that.$msg('【'+value.name+'】的店加价填写错误')
                    return false
                }
                if(that.$util.isMoney(value.hjAddPrice) == false){
-                   that.$msg('【'+value.name+'】的银店加价填写错误')
+                   that.$msg('【'+value.name+'】的同行加价填写错误')
                    return false
                }
-               if(that.$util.isMoney(value.zsAddPrice) == false){
-                   that.$msg('【'+value.name+'】的金店加价填写错误')
-                   return false
-               }
-                addData.push({id:value.id,skAddPrice:value.skAddPrice,addPrice:value.addPrice,hjAddPrice:value.hjAddPrice,zsAddPrice:value.zsAddPrice})
+
+                addData.push({id:value.id,skAddPrice:value.skAddPrice,addPrice:value.addPrice,hjAddPrice:value.hjAddPrice})
            })
            let addString = JSON.stringify(addData)
            batchChangeAddPrice({addData:addString}).then(res=>{

+ 1 - 1
ghsApp/src/pagesClient/member/detail.vue

@@ -172,7 +172,7 @@ export default {
       this.$util.pageTo({url: '/admin/billing/index',type:2,query: {customId: this.userInfo.id,customName:this.userInfo.name}})
     },
     changeLevel(){
-
+      this.$msg('开发中')
       let that = this
       let levelList = ['散客', '普店', '银店', '金店']
       uni.showActionSheet({