Merge pull request 'lixuan' (#8) from lixuan into master

Reviewed-on: http://192.168.0.140:3000/xkhl/LSM_OIL_SITE/pulls/8

pages/home/home.vue

@@ -408,7 +408,7 @@
 						}else{
 							this.showHeight = '340rpx'
 						}
-						uni.setStorageSync('oilSiteId',res.data.site.siteCode)
+						uni.setStorageSync('oilSitePriceId',res.data.site.id)
 					}
 				})
 			},

pages/station-price/station-price.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="page-content" style="background:#eff3f4;overflow: hidden;">
 		<cu-custom class="bg-main-oil"  :isBack="true"  bgColor="bg-main-oil">
+			<block slot="content">促销编辑</block>
 			<block slot="backText">返回</block>
 		</cu-custom>
 		<view class="main-money margin margin-bottom-0 radius bg-white cuxiao">
@@ -39,7 +40,7 @@
 			}
 		},
 		onLoad() {
-			this.oilSiteId = uni.getStorageSync('oilSiteId')
+			this.oilSiteId = uni.getStorageSync('oilSitePriceId')
 			this.getSiteInfo()
 			uni.showShareMenu()
 		},
@@ -61,6 +62,15 @@
 				console.log(e.detail.value,'dayineeeeeeeeeeeeeeeeeeee')
 			},
 			update(){
+				if(this.site.activitySwitch && !this.site.activityContent){
+					uni.showToast({
+						title:'请输入促销优惠内容'
+					})
+					return
+				}
+				if(!this.site.activitySwitch && !this.site.activityContent){
+					this.site.activityContent = '暂无'
+				}
 				oliSiteApi.update(this.site).then(res => {
 					if (res.code === 20000) {
 						uni.navigateBack()