update

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

@@ -10,7 +10,7 @@
 					<div class="list-right">
 						<div class="app-size-28 app-color-0">{{ item.adName }}</div>
 						<div v-if="item.endTime == '4102416000'">永久有效</div>
-						<div v-else>{{ item.endTime }}到期</div>
+						<div v-else>{{ item.endTime | formatTime }} 到期</div>
 						<div class="list-option">
 							<div>
 								<div>点击次数：{{ item.viewTimes }}</div>

mobile-code/src/admin/goodsManage/category.vue

@@ -187,7 +187,12 @@ export default {
 				this.completes(data)
 			})
 		},
+		// modal
 		_categoryAddOrEditB() {
+			if (!this.modifyForm.categoryName) {
+				this.$msg('请输入分类名称！')
+				return false
+			}
 			let host = this.modifyTitle == '编辑' ? categoryUpdateB : categoryAddB
 			let form = JSON.parse(JSON.stringify(this.modifyForm))
 			form.img = this.$util.imgSubstr(form.img)

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

@@ -120,10 +120,10 @@
 				// 底部操作
 				operateBottomShow: false,
 				btnBottomData: [
-					{
-						name: '图库管理',
-						click: () => this.$util.pageTo('/admin/goodsManage/img-store')
-					},
+					// {
+					// 	name: '图库管理',
+					// 	click: () => this.$util.pageTo('/admin/goodsManage/img-store')
+					// },
 					{
 						name: '运费设置',
 						click: () => this.$util.pageTo('/admin/goodsManage/freight')

mobile-code/src/admin/interest/invite.vue

@@ -3,7 +3,7 @@
 		<app-tabs :tabs="tabs" :isFixed="true" :isAdd="true" addIcon="iconshezhi" addText="设置" @add="pageTo('/admin/interest/setting')" :isBoxShadow="false" :currentTab="form.status" @change="change" itemWidth="25%" :padding="0" />
 		<div class="input-wrap">
 			<!-- <div class="map-search"> -->
-			<app-search-module placeholder="请输入商品名称" :isBtn="true" />
+			<app-search-module :val="form.search" placeholder="请输入商品名称" :isBtn="true" @search="searchFn" />
 			<!-- </div> -->
 			<!-- <div class="app-size-26">搜索</div> -->
 		</div>
@@ -152,6 +152,10 @@ export default {
 		async init() {
 			this._list()
 		},
+		searchFn(e) {
+			// this.form.search = e
+			this._list()
+		},
 		_list() {
 			let params = JSON.parse(JSON.stringify(this.form))
 			params.status = params.status - 1

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

@@ -80,8 +80,7 @@ export default {
 <style lang="scss" scoped>
     .prompt-text {
         color: $fontColor3;
-        padding-bottom: 20px;
-        padding-left: 30px;
+        padding: 0 30px 20px;
     }
 	.module-com {
         margin-bottom: 20px;

mobile-code/src/admin/staff/add.vue

@@ -47,7 +47,7 @@
 					<input v-model="form.mobile" placeholder-class="phcolor" class="tui-input" name="mobile" placeholder="请输入手机号" maxlength="50" type="number" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">登录密码</div>
+					<div class="tui-title">登录密码</div>
 					<input v-model="form.password" placeholder-class="phcolor" class="tui-input" name="password" placeholder="请输入" maxlength="50" type="password" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell remark-wrap" :hover="false">
@@ -205,7 +205,12 @@
 				hostFn(this.form).then(res => {
 					let promptText = this.option.id ? '修改成功！' : '添加成功！'
 					this.$msg(promptText)
-					this.$util.pageTo('/admin/staff/list')
+					setTimeout(() => {
+						this.$util.pageTo({
+							url: '/admin/staff/list',
+							type: 2
+						})
+					}, 1000)
 				})
 			},
 			// 表单验证
@@ -231,12 +236,12 @@
 						name: 'userId',
 						rule: ['required'],
 						msg: ['请选择关联微信']
-					},
-					{
-						name: 'password',
-						rule: ['required'],
-						msg: ['请输入密码']
 					}
+					// {
+					// 	name: 'password',
+					// 	rule: ['required'],
+					// 	msg: ['请输入密码']
+					// }
 				]
 				// 进行表单检查
 				let formData = e.detail.value