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

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

@@ -35,7 +35,7 @@ export default {
                     list:[
                         {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list"},
                         {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list"},
-                        {name: "花材颜色",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/colorManage"},
+                        {name: "颜色管理",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/colorManage"},
                         {name: "排序加价",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/add"},
                         {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1"},
                     ]

+ 3 - 3
ghsApp/src/admin/item/add.vue

@@ -84,11 +84,11 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">颜色可选</view>
+          <view class="tui-title">颜色管理</view>
           <view class="switch_bx">
             <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">可选</text>
-            <text v-else>不可选</text>
+            <text v-if="form.variety == 1">需要</text>
+            <text v-else>不需要</text>
           </view>
         </tui-list-cell>
 

+ 1 - 1
ghsApp/src/admin/item/colorManage.vue

@@ -3,7 +3,7 @@
 		<view class="list-wrap role-list">
 			<block v-if="!$util.isEmpty(colorList)">
 				<view class="list" v-for="(item, index) in colorList" :key="index">
-					<view class="app-size-32" @click="changeColor(item)" style="width:700upx;">{{ item.name }}</view>
+					<view class="app-size-32" @click="changeColor(item)" style="width:700upx;height:70upx;display:flex;align-items:center;">{{ item.name }}</view>
 				</view>
 			</block>
 			<block v-else>

+ 3 - 3
ghsApp/src/admin/item/copy.vue

@@ -83,11 +83,11 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">颜色可选</view>
+          <view class="tui-title">颜色管理</view>
           <view class="switch_bx">
             <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">可选</text>
-            <text v-else>不可选</text>
+            <text v-if="form.variety == 1">需要</text>
+            <text v-else>不需要</text>
           </view>
         </tui-list-cell>
 

+ 3 - 3
ghsApp/src/admin/item/detail.vue

@@ -84,11 +84,11 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">颜色可选</view>
+          <view class="tui-title">颜色管理</view>
           <view class="switch_bx">
             <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">可选</text>
-            <text v-else>不可选</text>
+            <text v-if="form.variety == 1">需要</text>
+            <text v-else>不需要</text>
           </view>
         </tui-list-cell>
 

+ 1 - 1
ghsApp/src/pages.json

@@ -349,7 +349,7 @@
 				{"path": "xj","style": {"navigationBarTitleText": "请选择颜色"}},
 				{"path": "xjSelect","style": {"navigationBarTitleText": "颜色管理"}},
 				{"path": "rechargeHb","style": {"navigationBarTitleText": "充值活动"}},
-				{"path": "colorManage","style": {"navigationBarTitleText": "花材颜色"}}
+				{"path": "colorManage","style": {"navigationBarTitleText": "请选择花材"}}
 			]
 		},
 		{

+ 1 - 1
hdApp/src/admin/billing/affirmGhs.vue

@@ -382,7 +382,7 @@ export default {
 
 			let xj = []
 			this.selectList.forEach((item) => {
-				let hasItem = uni.getStorageSync("ghsXj"+this.ghsInfo.id+"_"+item.itemId)
+				let hasItem = uni.getStorageSync("ghsColorItem"+this.ghsInfo.id+"_"+item.itemId)
 				if (!this.$util.isEmpty(hasItem)){
 					xj.push(hasItem)
 				}

+ 1 - 1
hdApp/src/admin/billing/affirmGhsBook.vue

@@ -319,7 +319,7 @@ export default {
 
 			let xj = []
 			this.selectList.forEach((item) => {
-				let hasItem = uni.getStorageSync("ghsXj"+this.ghsInfo.id+"_"+item.itemId)
+				let hasItem = uni.getStorageSync("ghsColorItem"+this.ghsInfo.id+"_"+item.itemId)
 				if (!this.$util.isEmpty(hasItem)){
 					xj.push(hasItem)
 				}

+ 1 - 1
hdApp/src/mixins/cgProduct.js

@@ -217,7 +217,7 @@ export default {
 				uni.removeStorageSync('selectList'+this.pageType+'_ghs_'+ghsId);
 				//删除多颜色花材记忆
 				this.selectList.forEach((item) => {
-					uni.removeStorageSync("ghsXj"+ghsId+"_"+item.itemId)
+					uni.removeStorageSync("ghsColorItem"+ghsId+"_"+item.itemId)
 				})
 			}else{
 				uni.removeStorageSync('selectList'+this.pageType);

+ 3 - 3
hdApp/src/pagesPurchase/xj.vue

@@ -62,7 +62,7 @@ export default {
 		this.xjStock = this.option.stock
 		this.xjPrice = this.option.price
 
-		let history = uni.getStorageSync("ghsXj"+this.option.ghsId+"_"+this.option.ptItemId)
+		let history = uni.getStorageSync("ghsColorItem"+this.option.ghsId+"_"+this.option.ptItemId)
 		if(!this.$util.isEmpty(history)){
 			history.forEach((item,index)=>{
 				this.numList[item.id] = item.num
@@ -78,7 +78,7 @@ export default {
 			uni.previewImage({urls: [url]})
 		},
 		clearXj(){
-			uni.removeStorageSync("ghsXj"+this.option.ghsId+"_"+this.option.ptItemId)
+			uni.removeStorageSync("ghsColorItem"+this.option.ghsId+"_"+this.option.ptItemId)
 			if(!this.$util.isEmpty(this.numList)){
 				this.numList.forEach((item,index,arr)=>{
 					arr[index]=''
@@ -130,7 +130,7 @@ export default {
 				return false
 			}
 
-			uni.setStorageSync("ghsXj"+this.option.ghsId+"_"+this.option.ptItemId, arr)
+			uni.setStorageSync("ghsColorItem"+this.option.ghsId+"_"+this.option.ptItemId, arr)
 
 			//返回上一页带参数
 			let pages = getCurrentPages();