Merge remote-tracking branch 'origin/master'

pages/member/add.vue

@@ -94,6 +94,8 @@
 				this.form.id=this.vuex_shopId
 				this.$api.memberCenter.create(this.form).then(res=>{
 					if (res.success) {
+						const selectedShop = this.$cache.get("selectedShop")
+						this.$cache.put("selectedShop",Object.assign(selectedShop,this.form))
 						this.$dialog.showModal('创建成功',false).then(res=>{
 							this.$jump('/pages/member/member')
 						})

pages/member/member.vue

@@ -74,9 +74,30 @@
 			<view class="u-popup-content">
 				<text>更改积分规则</text>
 				<u-form>
+					<view class="u-flex">
+						<u-input
+						v-model="selectedShop.point" 
+						border="true" 
+						border-color="#eaeaea"  
+						type="number" 
+						:clearable="false" 
+						placeholder="请输入积分"
+						/>
+						<view style="width: 150rpx;">积分</view>
+						<view style="width: 150rpx;">等于</view>
+						<u-input
+						v-model="selectedShop.pointValue" 
+						border="true" 
+						border-color="#eaeaea"  
+						type="number" 
+						:clearable="false" 
+						placeholder="请输入金额"
+						/>
+						<view>元</view>
+					</view>
 					<u-form-item label-width="180"  label="消费1元赠送">
 						<u-input 
-						v-model="consumeOnePoint" 
+						v-model="selectedShop.consumeOnePoint" 
 						border="true" 
 						border-color="#eaeaea"  
 						type="number" 
@@ -113,7 +134,6 @@
 					auto: false // 不自动加载
 				},
 				showPopup:false,
-				consumeOnePoint:'',
 				customStyle1:{
 					backgroundColor:'#D18C42',
 					color:'#fff',
@@ -144,10 +164,11 @@
 			update(){
 				let params = {
 					id: this.vuex_shopId,
-					consumeOnePoint:this.consumeOnePoint
+					consumeOnePoint:this.selectedShop.consumeOnePoint,
+					point:this.selectedShop.point,
+					pointValue:this.selectedShop.pointValue
 				}
 				this.$api.memberCenter.update(params).then(res => {
-					this.selectedShop.consumeOnePoint = this.consumeOnePoint
 					this.$cache.put("selectedShop",this.selectedShop)
 					this.showPopup = false
 				})