shish 6 лет назад
Родитель
Сommit
be5bf346a3
3 измененных файлов с 22 добавлено и 50 удалено
  1. 13 19
      store/src/admin/adminShop/bind.vue
  2. 8 1
      store/src/api/admin-shop/index.js
  3. 1 30
      store/src/api/member/index.js

+ 13 - 19
store/src/admin/adminShop/bind.vue

@@ -66,7 +66,7 @@
 import { mapGetters } from "vuex";
 import TuiListCell from "@/components/plugin/list-cell";
 const form = require("@/utils/formValidation.js");
-import { add } from "@/api/member";
+import { generateAdmin } from "@/api/admin-shop";
 import { getWxInfo, getWxPhone } from "@/api/mini";
 export default {
   name: "bind",
@@ -79,7 +79,8 @@ export default {
         mobile: "",
         nickname: "",
         recommendAdminId: 0,
-        shopId: 0
+        shopId: 0,
+        adminId: 0
       },
       levelSelData: {}
     };
@@ -103,11 +104,8 @@ export default {
   },
   methods: {
     confirmFn() {
-      add(this.form).then(res => {
+      generateAdmin(this.form).then(res => {
         this.$msg("添加成功!");
-        setTimeout(() => {
-          this.$util.pageTo(1);
-        }, 1000);
       });
     },
     // 表单验证
@@ -122,7 +120,12 @@ export default {
         {
           name: "nickname",
           rule: ["required"],
-          msg: ["请输入密码"]
+          msg: ["请输入昵称"]
+        },
+        {
+          name: "shopId",
+          rule: ["required"],
+          msg: ["系统错误(shopId)"]
         }
       ];
       // 进行表单检查
@@ -143,14 +146,10 @@ export default {
           iv: e.detail.iv,
           encryptedData: e.detail.encryptedData
         }).then(res => {
-          console.log("用户信息", res);
+          this.form.mobile = res.data.mobile;
           uni.showToast({
             icon: "success"
           });
-
-          setTimeout(() => {
-            this.stepIndex = 2;
-          }, 1000);
         });
       } else {
         this.$msg("获取信息失败!");
@@ -165,16 +164,11 @@ export default {
           // this.popupShow = true
           getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(
             subRes => {
-              console.log("用户信息", subRes);
+              this.form.adminId = subRes.data.id;
+
               uni.showToast({
                 icon: "success"
               });
-              this.wxInfo = subRes.data;
-              // this.$msg('创建用户信息成功!')
-              // this.popupShow = true
-              setTimeout(() => {
-                this.stepIndex = 1;
-              }, 1000);
             }
           );
         },

+ 8 - 1
store/src/api/admin-shop/index.js

@@ -1,7 +1,14 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 /** *
- * 创建管理员
+ * 准备创建管理员的数据
  */
 export const prepareBind = data => {
 	return https.post('/admin-shop/prepare-bind', data)
 }
+
+/** *
+ * 创建管理员
+ */
+export const generateAdmin = data => {
+	return https.post('/admin-shop/generate-admin', data)
+}

+ 1 - 30
store/src/api/member/index.js

@@ -1,34 +1,5 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
-/** *
- * 只要登录客户的优惠情况 m
- */
-export const userDiscount = data => {
-	return https.get('/user/discount', data)
-}
-
-/** *
- * 只要登录客户的资产情况 m
- */
-export const userAsset = data => {
-	return https.get('/user/asset', data)
-}
-
-/** *
- * 修改密码 m
- */
-export const modifyPassword = data => {
-	return https.post('/user/password', data)
-}
-
-/** *
- * 会员等级与折扣 m
- */
-export const userGrade = data => {
-	return https.post('/merchant/user-grade', data)
-}
-// =====================  B 端 ========================
-
 /** *
  * 客户列表 b
  */
@@ -86,7 +57,7 @@ export const remarkDel = data => {
 }
 
 /** *
- * 客户充值 m
+ * 客户充值 b
  */
 export const recharge = data => {
 	return https.get('/recharge/launch', data)