shish 6 лет назад
Родитель
Сommit
e1a4c3f0b3
2 измененных файлов с 128 добавлено и 99 удалено
  1. 118 93
      store/src/admin/staff/add.vue
  2. 10 6
      store/src/mixins/globalMixins.js

+ 118 - 93
store/src/admin/staff/add.vue

@@ -1,42 +1,43 @@
 <template>
   <div class="app-content">
-    <!-- 员工信息 -->
-    <form @submit="formSubmit" @reset="formReset">
-      <div class="module-com input-line-wrap">
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title required">员工姓名</div>
-          <input
-            v-model="form.adminName"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="adminName"
-            placeholder="请输入姓名"
-            maxlength="50"
-            type="text"
-          />
-        </tui-list-cell>
-        <!--
+    <div v-show="showStaffArea">
+      <!-- 员工信息 -->
+      <form @submit="formSubmit" @reset="formReset">
+        <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title required">姓名</div>
+            <input
+              v-model="form.adminName"
+              placeholder-class="phcolor"
+              class="tui-input"
+              name="adminName"
+              placeholder="请输入姓名"
+              maxlength="50"
+              type="text"
+            />
+          </tui-list-cell>
+          <!--
                 <tui-list-cell class="line-cell" :hover="false">
                     <div class="tui-title required">手机号</div>
                     <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" :arrow="true">
-          <div class="tui-title required">角色</div>
-          <picker
-            mode="selector"
-            :value="form.roleId"
-            :range="roleList"
-            range-key="roleName"
-            @change="changeRoleFn"
-            class="tui-input"
-          >
-            <input v-model="form.roleId" name="roleId" type="text" hidden />
-            <div v-if="form.roleId">{{ roleSelData.roleName }}</div>
-            <div class="tui-placeholder" v-else>请选择</div>
-          </picker>
-        </tui-list-cell>
-        <!--
+          -->
+          <tui-list-cell class="line-cell" :arrow="true">
+            <div class="tui-title required">角色</div>
+            <picker
+              mode="selector"
+              :value="form.roleId"
+              :range="roleList"
+              range-key="roleName"
+              @change="changeRoleFn"
+              class="tui-input"
+            >
+              <input v-model="form.roleId" name="roleId" type="text" hidden />
+              <div v-if="form.roleId">{{ roleSelData.roleName }}</div>
+              <div class="tui-placeholder" v-else>请选择</div>
+            </picker>
+          </tui-list-cell>
+          <!--
 				<tui-list-cell class="line-cell" :arrow="true" @click="selMemberFn">
 					<div class="tui-title required">绑定微信</div>
 					<div v-if="form.userId" class="member-wrap flex-center">
@@ -51,57 +52,65 @@
 					</div>
 					<div v-else class="tui-placeholder">请选择</div>
 				</tui-list-cell>
-        -->
-      </div>
-      <!-- 收款通知 -->
-      <div class="module-com input-line-wrap">
-        <tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
-          <div class="tui-title">收款通知</div>
-          <div>
-            <switch :checked="form.remind == 0 ? false : true" @change="remindChangeFn" />
-          </div>
-        </tui-list-cell>
-      </div>
-      <!-- 登录信息 -->
-      <div class="module-com input-line-wrap">
-        <tui-list-cell class="line-cell" :hover="false">
-          <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">
-          <div class="tui-title">备注信息</div>
-          <div class="tui-input">
-            <textarea
-              v-model="form.remark"
-              class="tui-textarea remark"
+          -->
+        </div>
+        <!-- 收款通知 -->
+        <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
+            <div class="tui-title">收款通知</div>
+            <div>
+              <switch :checked="form.remind == 0 ? false : true" @change="remindChangeFn" />
+            </div>
+          </tui-list-cell>
+        </div>
+        <!-- 登录信息 -->
+        <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">登录密码</div>
+            <input
+              v-model="form.password"
               placeholder-class="phcolor"
-              placeholder="请输入内容"
+              class="tui-input"
+              name="password"
+              placeholder="请输入"
+              maxlength="50"
+              type="password"
             />
-          </div>
-        </tui-list-cell>
-      </div>
-      <!-- 马上启用 -->
-      <div class="module-com input-line-wrap">
-        <tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
-          <div class="tui-title">启用状态</div>
-          <div>
-            <switch :checked="form.status == 0 ? false : true" @change="statusChangeFn" />
-          </div>
-        </tui-list-cell>
-      </div>
-      <!-- 提交 -->
-      <div class="confirm-btn">
-        <button class="admin-button-com big blue" formType="submit">提交</button>
-      </div>
-    </form>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell remark-wrap" :hover="false">
+            <div class="tui-title">备注信息</div>
+            <div class="tui-input">
+              <textarea
+                v-model="form.remark"
+                class="tui-textarea remark"
+                placeholder-class="phcolor"
+                placeholder="请输入内容"
+              />
+            </div>
+          </tui-list-cell>
+        </div>
+        <!-- 马上启用 -->
+        <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
+            <div class="tui-title">启用状态</div>
+            <div>
+              <switch :checked="form.status == 0 ? false : true" @change="statusChangeFn" />
+            </div>
+          </tui-list-cell>
+        </div>
+        <!-- 提交 -->
+        <div class="confirm-btn">
+          <button class="admin-button-com big blue" formType="submit">提交</button>
+        </div>
+      </form>
+    </div>
+    <div v-show="showMiniCodeArea">
+      <view style="text-align:center;">
+          <image style="width:200px;height:200px;margin:0 auto;" :src="miniCodeSrc"></image>
+          <view style="text-align:center;margin-top:20px;margin-bottom:20px;">请扫上方小程序码完成绑定</view>
+          <button class="admin-button-com big blue" @click="complete">完成</button>
+      </view>
+    </div>
   </div>
 </template>
 
@@ -129,14 +138,17 @@ export default {
         adminName: "",
         //mobile: '',
         roleId: "",
-        remind: 0,
+        remind: 1,
         password: "",
         //userId: '',
-        status: 0,
-        remark: ""
+        status: 1,
+        remark: "",
       },
       roleList: [],
       roleSelData: {},
+      showStaffArea: true,
+      showMiniCodeArea: false,
+      miniCodeSrc:'',
       memberData: {}
     };
   },
@@ -241,16 +253,29 @@ export default {
         this.form.id = this.option.id;
       }
       hostFn(this.form).then(res => {
-        let promptText = this.option.id ? "修改成功!" : "添加成功!";
-        this.$msg(promptText);
-        setTimeout(() => {
-          this.$util.pageTo({
-            url: "/admin/staff/list",
-            type: 2
-          });
-        }, 1000);
+        console.log('23rh23r23')
+        console.log(res)
+        console.log(this.option.id)
+        if(typeof(this.option.id) == 'undefined'){
+          this.showMiniCodeArea = true;
+          this.miniCodeSrc = res.data.miniCode;
+          this.showStaffArea = false;
+          console.log(this.miniCodeSrc)
+          console.log('--oo0oooo---')
+        }
+        // let promptText = this.option.id ? "修改成功!" : "添加成功!";
+        // this.$msg(promptText);
+        // setTimeout(() => {
+        //   this.$util.pageTo({
+        //     url: "/admin/staff/list",
+        //     type: 2
+        //   });
+        // }, 1000);
       });
     },
+    complete(){
+      this.$util.pageTo(1)
+    },
     // 表单验证
     formSubmit(e) {
       // 表单规则

+ 10 - 6
store/src/mixins/globalMixins.js

@@ -29,15 +29,19 @@ export default {
 		}
 		uni.setStorageSync('currentQuery', JSON.stringify(option))
 		if (isLogin() == false) {
-			// if (this.init) {
-			// 	if (constant.source == 'store') {
-			// 		getUser()
-			// 	}
-			// 	this.init()
-			// }
+			if (this.init) {
+				// 	if (constant.source == 'store') {
+				// 		getUser()
+				// 	}
+				this.init()
+			}
 			wxLoginFn().then(res => {
 				getUser()
 			})
+		} else {
+			if (this.init) {
+				this.init()
+			}
 		}
 		// getCheckLogin().then(res => {
 		// 	if (constant.source == 'store') {