Merge branch 'master' of http://git.huaml.com/zhh/front-end

admin-update/src/mock/userInfo.js

@@ -459,7 +459,7 @@ let menu = {
 		{
 			id: '1101',
 			parentId: '11',
-			name: '微信菜单设置',
+			name: '微信菜单',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 12,
@@ -470,7 +470,7 @@ let menu = {
 		{
 			id: '1102',
 			parentId: '11',
-			name: '新人领券设置',
+			name: '新人优惠券',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 12,
@@ -481,7 +481,7 @@ let menu = {
 		{
 			id: '1103',
 			parentId: '11',
-			name: '会员等级设置',
+			name: '会员等级',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 12,

admin-update/src/views/goods/auto-price.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="app-content auto-price-wrap">
 		<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-form">
-			<el-form-item label="自动涨价状态" prop="riseSwitch">
+			<el-form-item label="涨价开关" prop="riseSwitch">
 				<el-switch
 					v-model="form.riseSwitch"
 					active-value="1"
@@ -49,7 +49,7 @@
 
 			<el-form-item>
 				<div class="app-color-3">
-					提示：在节日的前一天和当天，商城设置自动涨价的商品将会全部统一涨价。过后自动恢复原价。
+					节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。
 				</div>
 			</el-form-item>
 			<el-form-item>

mobile-code-back/src/admin/goodsManage/price-increase.vue

@@ -42,7 +42,7 @@
 				</tui-list-cell>
 			</block>
 		</div>
-		<div class="prompt-text">提示：在节日的前一天和当天，商城设置自动涨价的商品将会全部 统一涨价。过后自动恢复原价。</div>
+		<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
 		<button class="admin-button-com blue big confirm-btn" @click="setPrice">确定</button>
 	</div>
 </template>

mobile-code-back/src/admin/setting/coupon.vue

@@ -21,7 +21,7 @@
                 </div>
 			</div>
 		</div>
-		<div class="prompt-text">提示：在节日的前一天和当天, 商城设置自动涨价的商品将会全部 统一涨价。过后自动恢复原价。</div>
+		<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
 		<div class="admin-button-com blue big" @click="confirmFn">确定</div>
 	</div>
 </template>

mobile-code-back/src/admin/setting/list.vue

@@ -20,17 +20,17 @@ export default {
 		return {
 			data: [
 				{
-					name: '微信菜单设置',
+					name: '微信菜单',
 					icon: 'iconweixin',
 					url: '/admin/setting/wx-menu'
 				},
 				{
-					name: '新人领券设置',
+					name: '新人优惠券',
 					icon: 'iconxinrenlingquanshezhi',
 					url: '/admin/setting/coupon'
 				},
 				{
-					name: '会员等级设置',
+					name: '会员等级',
 					icon: 'iconhuiyuandengjishezhi',
 					url: '/admin/setting/level'
 				}

mobile-code-back/src/b-pages.json

@@ -165,19 +165,19 @@
 				{
 					"path": "wx-menu",
 					"style": {
-						"navigationBarTitleText": "微信菜单设置"
+						"navigationBarTitleText": "微信菜单"
 					}
 				},
 				{
 					"path": "coupon",
 					"style": {
-						"navigationBarTitleText": "新人领券设置"
+						"navigationBarTitleText": "新人优惠券"
 					}
 				},
 				{
 					"path": "level",
 					"style": {
-						"navigationBarTitleText": "会员等级设置"
+						"navigationBarTitleText": "会员等级"
 					}
 				},
 				{

mobile-code/src/admin/goodsManage/price-increase.vue

@@ -42,7 +42,7 @@
 				</tui-list-cell>
 			</block>
 		</div>
-		<div class="prompt-text">提示：在节日的前一天和当天，商城设置自动涨价的商品将会全部 统一涨价。过后自动恢复原价。</div>
+		<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
 		<button class="admin-button-com blue big confirm-btn" @click="setPrice">确定</button>
 	</div>
 </template>

mobile-code/src/admin/setting/coupon.vue

@@ -21,7 +21,7 @@
                 </div>
 			</div>
 		</div>
-		<div class="prompt-text">提示：在节日的前一天和当天, 商城设置自动涨价的商品将会全部 统一涨价。过后自动恢复原价。</div>
+		<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
 		<div class="admin-button-com blue big" @click="confirmFn">确定</div>
 	</div>
 </template>

mobile-code/src/admin/setting/list.vue

@@ -20,17 +20,17 @@ export default {
 		return {
 			data: [
 				{
-					name: '微信菜单设置',
+					name: '微信菜单',
 					icon: 'iconweixin',
 					url: '/admin/setting/wx-menu'
 				},
 				{
-					name: '新人领券设置',
+					name: '新人优惠券',
 					icon: 'iconxinrenlingquanshezhi',
 					url: '/admin/setting/coupon'
 				},
 				{
-					name: '会员等级设置',
+					name: '会员等级',
 					icon: 'iconhuiyuandengjishezhi',
 					url: '/admin/setting/level'
 				}