散客价

ghs/src/views/item/list.vue

@@ -35,12 +35,12 @@
       </template>
 
       <template #table-column-price="{scope}">
-        <span v-if="!priceInput"><span>{{ scope.row.price}}</span></span>
+        <span v-if="!priceInput" style="color:blue;"><span>{{ scope.row.price}}</span></span>
 		<el-input style="width:80%;" ref="sort-input" focus size="mini" v-else placeholder="" v-model="scope.row.price" @blur="changeInputValue(scope.row, 'price')" ></el-input>
       </template>
       <template #table-header-price>
         <div class="set-sort">
-          <span>普通价</span>
+          <span style="color:blue;">普通价</span>
           <el-button v-if="!priceInput" icon="el-icon-edit-outline" size="small" type="text" @click="showPriceInput" class="show"></el-button>
           <el-button class="hide" v-else size="mini" @click="commitChange('price')" type="primary">完成</el-button>
         </div>
@@ -113,46 +113,31 @@
 
 		<template #table-header-addPrice="{scope}">
 			<div class="set-sort">
-				<span>普通加价</span>
+				<span style="color:blue;">普通加价</span>
 				<el-button v-if="!canAddPrice" icon="el-icon-edit-outline" size="small" type="text" @click="showAddPrice" class="show"></el-button>
 				<el-button class="hide" v-if="canAddPrice"  size="mini" @click="showMultiplePop(scope,'addPrice')" type="primary">批</el-button>
 				<el-button class="hide" v-if="canAddPrice"  size="mini" @click="commitChange('addPrice')" type="primary">完成</el-button>
 			</div>
 		</template>
 		<template #table-column-addPrice="{scope}">
-			<span v-if="!canAddPrice">{{ scope.row.addPrice }}</span>
+			<span v-if="!canAddPrice" style="color:blue;">{{ scope.row.addPrice }}</span>
 			<el-input style="width:80%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.addPrice" @blur="changeInputValue(scope.row, 'addPrice')" ></el-input>
 		</template>
 
 
-		<template #table-header-qtAddPrice="{scope}">
+		<template #table-header-skAddPrice="{scope}">
 			<div class="set-sort">
-				<span>青铜加价</span>
-				<el-button v-if="!canQtAddPrice" icon="el-icon-edit-outline" size="small" type="text" @click="showQtAddPrice" class="show"></el-button>
-				<el-button class="hide" v-if="canQtAddPrice"  size="mini" @click="showMultiplePop(scope,'qtAddPrice')" type="primary">批</el-button>
-				<el-button class="hide" v-if="canQtAddPrice"  size="mini" @click="commitChange('qtAddPrice')" type="primary">完成</el-button>
+				<span>散客加价</span>
+				<el-button v-if="!canSkAddPrice" icon="el-icon-edit-outline" size="small" type="text" @click="showSkAddPrice" class="show"></el-button>
+				<el-button class="hide" v-if="canSkAddPrice"  size="mini" @click="showMultiplePop(scope,'skAddPrice')" type="primary">批</el-button>
+				<el-button class="hide" v-if="canSkAddPrice"  size="mini" @click="commitChange('skAddPrice')" type="primary">完成</el-button>
 			</div>
 		</template>
-		<template #table-column-qtAddPrice="{scope}">
-			<span v-if="!canQtAddPrice">{{ scope.row.qtAddPrice }}</span>
-			<el-input style="width:80%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.qtAddPrice" @blur="changeInputValue(scope.row, 'qtAddPrice')" ></el-input>
+		<template #table-column-skAddPrice="{scope}">
+			<span v-if="!canSkAddPrice">{{ scope.row.skAddPrice }}</span>
+			<el-input style="width:80%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.skAddPrice" @blur="changeInputValue(scope.row, 'skAddPrice')" ></el-input>
 		</template>
 
-
-		<template #table-header-byAddPrice="{scope}">
-			<div class="set-sort">
-				<span>白银加价</span>
-				<el-button v-if="!canByAddPrice" icon="el-icon-edit-outline" size="small" type="text" @click="showByAddPrice" class="show"></el-button>
-				<el-button class="hide" v-if="canByAddPrice"  size="mini" @click="showMultiplePop(scope,'byAddPrice')" type="primary">批</el-button>
-				<el-button class="hide" v-if="canByAddPrice"  size="mini" @click="commitChange('byAddPrice')" type="primary">完成</el-button>
-			</div>
-		</template>
-		<template #table-column-byAddPrice="{scope}">
-			<span v-if="!canByAddPrice">{{ scope.row.byAddPrice }}</span>
-			<el-input style="width:80%;" ref="add-price-input" focus size="mini" v-else v-model="scope.row.byAddPrice" @blur="changeInputValue(scope.row, 'byAddPrice')" ></el-input>
-		</template>
-
-
 		<template #table-header-hjAddPrice="{scope}">
 			<div class="set-sort">
 				<span>黄金加价</span>
@@ -385,7 +370,7 @@ export default {
 		dialogFormVisible:false,
 
 		canAddPrice:false,
-		canQtAddPrice:false,
+		canSkAddPrice:false,
 		canByAddPrice:false,
 		canHjAddPrice:false,
 		canZsAddPrice:false,
@@ -650,20 +635,14 @@ export default {
 				'min-width': 60,
 			},
             {
-              prop: 'addPrice',
-              label: '普通加价',
-              align: 'center',
-              'min-width': 130
-            },
-            {
-              prop: 'qtAddPrice',
-              label: '青铜加价',
+              prop: 'skAddPrice',
+              label: '散客加价',
               align: 'center',
               'min-width': 130
             },
             {
-              prop: 'byAddPrice',
-              label: '白银加价',
+              prop: 'addPrice',
+              label: '普通加价',
               align: 'center',
               'min-width': 130
             },
@@ -686,22 +665,16 @@ export default {
               'min-width': 90
             },
             {
-              prop: 'price',
-              label: '普通价',
-              align: 'center',
-              minWidth:105
-            },
-            {
-              prop: 'qtPrice',
-              label: '青铜价',
+              prop: 'skPrice',
+              label: '散客价',
               align: 'center',
               minWidth:100
             },
             {
-              prop: 'byPrice',
-              label: '白银价',
+              prop: 'price',
+              label: '普通价',
               align: 'center',
-              minWidth:100
+              minWidth:105
             },
             {
               prop: 'hjPrice',
@@ -821,12 +794,12 @@ export default {
 		this.costWeight = false;
 
     	this.canAddPrice = true;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
     },
-	showQtAddPrice(){
+	showSkAddPrice(){
     	this.initData = []
 		this.priceInput = false;
 		this.shelfLifeInput = false;
@@ -837,7 +810,7 @@ export default {
 		this.costWeight = false;
 
     	this.canAddPrice = false;
-		this.canQtAddPrice = true;
+		this.canSkAddPrice = true;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
@@ -853,7 +826,7 @@ export default {
 		this.costWeight = false;
 
     	this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = true;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
@@ -869,7 +842,7 @@ export default {
 		this.costWeight = false;
 
     	this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = true;
 		this.canZsAddPrice = false;
@@ -885,7 +858,7 @@ export default {
 		this.costWeight = false;
 
     	this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = true;
@@ -901,7 +874,7 @@ export default {
 		this.costWeight = false;
 
 		this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
@@ -916,7 +889,7 @@ export default {
 		this.canAddRatio = false;
 
 		this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
@@ -932,7 +905,7 @@ export default {
 		this.costWeight = false;
 
 		this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
@@ -948,7 +921,7 @@ export default {
 		this.costWeight = false;
 
 		this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
@@ -964,7 +937,7 @@ export default {
 		this.costWeight = false;
 
 		this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
@@ -980,7 +953,7 @@ export default {
 		this.costWeight = false;
 
 		this.canAddPrice = false;
-		this.canQtAddPrice = false;
+		this.canSkAddPrice = false;
 		this.canByAddPrice = false;
 		this.canHjAddPrice = false;
 		this.canZsAddPrice = false;
@@ -996,8 +969,8 @@ export default {
 			case 'addPrice':
 				this.canAddPrice = false;
 			break;
-			case 'qtAddPrice':
-				this.canQtAddPrice = false;
+			case 'skAddPrice':
+				this.canSkAddPrice = false;
 			break;
 			case 'byAddPrice':
 				this.canByAddPrice = false;
@@ -1105,10 +1078,10 @@ export default {
 				ele.addPrice = batchAddNum
 				this.initData.push({id:ele.id,addPrice:ele.addPrice})
 
-			}else if(this.dataList.form.type == 'qtAddPrice'){
-				let batchAddNum = (Number(this.batchAddNum) + Number(ele.qtAddPrice)).toFixed(2)
-				ele.qtAddPrice = batchAddNum
-				this.initData.push({id:ele.id,qtAddPrice:ele.qtAddPrice})
+			}else if(this.dataList.form.type == 'skAddPrice'){
+				let batchAddNum = (Number(this.batchAddNum) + Number(ele.skAddPrice)).toFixed(2)
+				ele.skAddPrice = batchAddNum
+				this.initData.push({id:ele.id,skAddPrice:ele.skAddPrice})
 
 
 			}else if(this.dataList.form.type == 'byAddPrice'){
@@ -1154,9 +1127,9 @@ export default {
 				ele.addPrice = this.batchAlterNum
 				this.initData.push({id:ele.id,addPrice:this.batchAlterNum})
 
-			}else if(this.dataList.form.type == 'qtAddPrice'){
-				ele.qtAddPrice = this.batchAlterNum
-				this.initData.push({id:ele.id,qtAddPrice:this.batchAlterNum})
+			}else if(this.dataList.form.type == 'skAddPrice'){
+				ele.skAddPrice = this.batchAlterNum
+				this.initData.push({id:ele.id,skAddPrice:this.batchAlterNum})
 
 			}else if(this.dataList.form.type == 'byAddPrice'){
 				ele.byAddPrice = this.batchAlterNum
@@ -1195,8 +1168,8 @@ export default {
 			obj.inTurn = d.inTurn
 		} else if(type == 'addPrice') {
 			obj.addPrice = d.addPrice
-		} else if(type == 'qtAddPrice') {
-			obj.qtAddPrice = d.qtAddPrice
+		} else if(type == 'skAddPrice') {
+			obj.skAddPrice = d.skAddPrice
 		} else if(type == 'byAddPrice') {
 			obj.byAddPrice = d.byAddPrice
 		} else if(type == 'hjAddPrice') {

ghsApp/src/admin/changePrice/list.vue

@@ -93,7 +93,7 @@ export default {
 		downloadTable(){
 
 			let level = 0
-			let levelList = ['普通价', '青铜价', '白银价','黄金价','钻石价']
+			let levelList = ['散客', '普通会员', '黄金会员','钻石会员']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {

ghsApp/src/admin/custom/levelSet.vue

@@ -7,25 +7,16 @@
 
             <view>
                 <view class="item">
-                    <view>青铜：
-<input v-model="levelInfo.qtNum" @click="levelInfo.qtNum=''" placeholder-class="phcolor" class="tui-input" type="number"  /> 扎
-<input v-model="levelInfo.qtAmount" @click="levelInfo.qtAmount=''" placeholder-class="phcolor" class="tui-input" type="digit"  /> 元
+                    <view>普通会员：
+<input v-model="levelInfo.num" @click="levelInfo.num=''" placeholder-class="phcolor" class="tui-input" type="number"  /> 扎
+<input v-model="levelInfo.amount" @click="levelInfo.amount=''" placeholder-class="phcolor" class="tui-input" type="digit"  /> 元
                     </view>
                 </view>
             </view>
 
             <view>
                 <view class="item">
-                    <view>白银：
-<input v-model="levelInfo.byNum" @click="levelInfo.byNum=''" placeholder-class="phcolor" class="tui-input" type="number"  /> 扎
-<input v-model="levelInfo.byAmount" @click="levelInfo.byAmount=''" placeholder-class="phcolor" class="tui-input" type="digit"  /> 元
-                    </view>
-                </view>
-            </view>
-
-            <view>
-                <view class="item">
-                    <view>黄金：
+                    <view>黄金会员：
 <input v-model="levelInfo.hjNum" @click="levelInfo.hjNum=''" placeholder-class="phcolor" class="tui-input" type="number"  /> 扎
 <input v-model="levelInfo.hjAmount" @click="levelInfo.hjAmount=''" placeholder-class="phcolor" class="tui-input" type="digit"  /> 元
                     </view>
@@ -34,7 +25,7 @@
 
             <view>
                 <view class="item">
-                    <view>钻石：
+                    <view>钻石会员：
 <input v-model="levelInfo.zsNum" @click="levelInfo.zsNum=''" placeholder-class="phcolor" class="tui-input" type="number"  /> 扎
 <input v-model="levelInfo.zsAmount" @click="levelInfo.zsAmount=''" placeholder-class="phcolor" class="tui-input" type="digit"  /> 元
                     </view>
@@ -59,10 +50,8 @@ export default {
 	data() {
 		return {
             levelInfo:{
-                qtNum:'',
-                qtAmount:'',
-                byNum:'',
-                byAmount:'',
+                num:'',
+                amount:'',
                 hjNum:'',
                 hjAmount:'',
                 zsNum:'',
@@ -92,8 +81,8 @@ export default {
         },
         saveData(){
             let that = this
-            const {qtNum,qtAmount,byNum,byAmount,hjNum,hjAmount,zsNum,zsAmount} = this.levelInfo
-            replaceLevel({qtNum,qtAmount,byNum,byAmount,hjNum,hjAmount,zsNum,zsAmount}).then(res=>{
+            const {num,amount,byNum,byAmount,hjNum,hjAmount,zsNum,zsAmount} = this.levelInfo
+            replaceLevel({num,amount,byNum,byAmount,hjNum,hjAmount,zsNum,zsAmount}).then(res=>{
                 if(res.code == 1){
                     that.$msg(res.msg)
                     setTimeout(function(){

ghsApp/src/admin/item/list.vue

@@ -101,7 +101,7 @@ export default {
 		downloadTable(){
 
 			let level = 0
-			let levelList = ['普通价', '青铜价', '白银价','黄金价','钻石价']
+			let levelList = ['散客', '普通会员', '黄金会员','钻石会员']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {

ghsApp/src/pagesClient/member/detail.vue

@@ -169,7 +169,7 @@ export default {
     changeLevel(){
 
       let that = this
-      let levelList = ['普通', '青铜', '白银','黄金','钻石']
+      let levelList = ['散客', '普通会员', '黄金会员', '钻石会员']
       uni.showActionSheet({
         itemList: levelList,
         success: function (respond) {

hdApp/src/admin/ghsProduct/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-content">
     <app-swiper :height="{type: 'number',val: 750}" :tagShow="true" :list="imgList" />
-    <!-- 商品简介 -->
+
     <div class="shop-intro">
       <div class="app-price app-bold">
         <text>￥</text>
@@ -25,21 +25,18 @@
       </div>
 
     </div>
-      <div class="shop-express app-color-3">
+    <div class="shop-express app-color-3">
 
-        <text>普通 {{parseFloat(productInfo.originalInfo.price)||0}}</text>
-        <text>青铜 {{parseFloat(productInfo.originalInfo.qtPrice)||0}}</text>
-        <text>白银 {{parseFloat(productInfo.originalInfo.byPrice)||0}}</text>
-        <text>黄金 {{parseFloat(productInfo.originalInfo.hjPrice)||0}}</text>
-        <text>钻石 {{parseFloat(productInfo.originalInfo.zsPrice)||0}}</text>
+      <text>普通客户 {{parseFloat(productInfo.originalInfo.skPrice)||0}}</text>
+      <text>会员 {{parseFloat(productInfo.originalInfo.price)||0}}</text>
+      <text>黄金会员 {{parseFloat(productInfo.originalInfo.hjPrice)||0}}</text>
+      <text>钻石会员 {{parseFloat(productInfo.originalInfo.zsPrice)||0}}</text>
 
-      </div>
-    <!-- 商品详情 -->
+    </div>
 
     <div class="module-wrap shop-detail">
       <div class="module-tit app-size-30">商品详情</div>
       <div class="module-det">
-        <!-- <app-img :src="imgNormal" alt mode="widthFix" /> -->
         <div class="module-det-text">
           <template v-if="$util.isEmpty(productInfo.content) == false">
             <rich-text :nodes="productInfo.content"></rich-text>