增加会员码

.env

@@ -7,13 +7,13 @@ NODE_ENV = 'production'
 VUE_APP_ENV = develop
 
 # 接口请求基地址
-VUE_APP_API_BASE_URL = http://localhost:8076
+VUE_APP_API_BASE_URL = https://delivery.ixiaokejia.com
 
 # 接口请求基地址
 VUE_APP_WEBSOCKET_BASE_URL = 
 
 # 图片基地址
-VUE_APP_IMAGE_BASE_URL = http://localhost:8076
+VUE_APP_IMAGE_BASE_URL = https://delivery.ixiaokejia.com
 VUE_APP_IMAGE_RESOURCE_URL = https://oss.ixiaokejia.com
 
 # 微信小程序appId

.env.develop

@@ -7,13 +7,13 @@ NODE_ENV = 'production'
 VUE_APP_ENV = production
 
 # 接口请求基地址
-VUE_APP_API_BASE_URL = http://localhost:8076
+VUE_APP_API_BASE_URL = https://delivery.ixiaokejia.com
 
 # 接口请求基地址
 VUE_APP_WEBSOCKET_BASE_URL = 
 
 # 图片基地址
-VUE_APP_IMAGE_BASE_URL = http://localhost:8076
+VUE_APP_IMAGE_BASE_URL = https://delivery.ixiaokejia.com
 VUE_APP_IMAGE_RESOURCE_URL = https://oss.ixiaokejia.com
 
 # 微信小程序appId

.env.production

@@ -7,13 +7,13 @@ NODE_ENV = 'production'
 VUE_APP_ENV = production
 
 # 接口请求基地址
-VUE_APP_API_BASE_URL =http://localhost:8076
+VUE_APP_API_BASE_URL = https://delivery.ixiaokejia.com
 
 # 接口请求基地址
 VUE_APP_WEBSOCKET_BASE_URL = 
 
 # 图片基地址
-VUE_APP_IMAGE_BASE_URL = http://localhost:8076
+VUE_APP_IMAGE_BASE_URL = https://delivery.ixiaokejia.com
 VUE_APP_IMAGE_RESOURCE_URL = https://oss.ixiaokejia.com
 
 # 微信小程序appId

releaselog.md

@@ -1,4 +1,7 @@
 
+# 0.3.7 (20.12.23 18:00) 
+### 增加会员码
+
 # 0.3.7 (20.12.21 18:00) 
 ### 增加导航权限
 

src/pages/index/index.vue

@@ -11,9 +11,15 @@
                     </div>
                 </div>
             </div>
-            <div class="scan" @click="scan">
+            <div class="scan">
                 <my-image
                     class="scan-img"
+                    @click="inputCode"
+                    src="/static/icon/edit.png"
+                ></my-image>
+                <my-image
+                    class="scan-img"
+                    @click="scan"
                     src="/static/icon/scan.png"
                 ></my-image>
             </div>
@@ -445,16 +451,29 @@
             当前小程序需要绑定手机号使用,
             <span class="bind" @click="goBind">去绑定</span>
         </div>
+
+        <uni-popup ref="popup" type="dialog">
+            <uni-popup-dialog
+                mode="input"
+                :title="'会员码'"
+                :content="false"
+                :inputType="'text'"
+                placeholder="请输入会员码"
+                @confirm="popupConfirm"
+            ></uni-popup-dialog>
+        </uni-popup>
     </div>
 </template>
 
 <script>
 import MyImage from "../../components/image/index";
 import fn from "../../common/js/function";
+import uniPopup from "../../components/uni-popup/uni-popup";
+import uniPopupDialog from "../../components/uni-popup/uni-popup-dialog";
 
 export default {
     name: "",
-    components: { MyImage },
+    components: { MyImage, uniPopup, uniPopupDialog },
     // 数据
     data() {
         return {
@@ -1015,13 +1034,17 @@ export default {
                 scanType: "qrCode",
                 success(res) {
                     console.log("扫码", res);
-                    if (res.scanType === "QR_CODE" && res.result && res.result.length === 9) {
-                       self.router.push({
-                           path:'/pages/index/index-scan',
-                           query:{
-                               vipcode:res.result
-                           }
-                       })
+                    if (
+                        res.scanType === "QR_CODE" &&
+                        res.result &&
+                        res.result.length === 9
+                    ) {
+                        self.router.push({
+                            path: "/pages/index/index-scan",
+                            query: {
+                                vipcode: res.result,
+                            },
+                        });
                     } else {
                         self.fn.showToast("扫码失败,不是有效会员码,请重新扫描");
                     }
@@ -1032,6 +1055,30 @@ export default {
                 },
             });
         },
+
+        // 输入会员码
+        inputCode() {
+            this.$refs.popup.open({
+                type: "dialog",
+            });
+        },
+
+        popupConfirm(done, value) {
+            let self = this;
+            if (!value) {
+                return this.fn.showToast("请输入会员码");
+            }
+            if (!/^\d{9}$/.test(value)) {
+                return this.fn.showToast("会员码不正确");
+            }
+            done();
+            self.router.push({
+                path: "/pages/index/index-scan",
+                query: {
+                    vipcode: value,
+                },
+            });
+        },
     },
 
     // 数据计算
@@ -1087,9 +1134,17 @@ page {
         display: flex;
         align-items: center;
     }
+    .scan {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
     .scan-img {
         width: px(70);
         height: px(70);
+        & ~ .scan-img {
+            margin-left: px(30);
+        }
         /deep/ img {
             width: px(70);
             height: px(70);

src/pages/manage/index.vue

@@ -47,7 +47,7 @@
 
         <button class="btn" @click="layout">退出登录</button>
 
-        <div class="ver">0.3.7</div>
+        <div class="ver">0.3.8</div>
     </div>
 </template>
 
@@ -180,6 +180,7 @@ export default {
             this.$store.commit("user/logout", null);
             this.router.replace({
                 path: "/pages/index/login",
+                isReLaunch: true,
             });
         },
     },

src/pages/manage/mina/query.vue

@@ -126,6 +126,7 @@ export default {
             this.$store.commit("user/logout", null);
             this.router.replace({
                 path: "/pages/index/login",
+                isReLaunch:true
             });
         },
     },

src/pages/manage/mina/register.vue

@@ -122,6 +122,7 @@ export default {
             this.$store.commit("user/logout", null);
             this.router.replace({
                 path: "/pages/index/login",
+                isReLaunch:true
             });
         },
     },

src/pages/manage/user/info.vue

@@ -4,25 +4,89 @@
             <section class="form-item">
                 <div class="label">
                     <span class="required hide">*</span>
-                    账号：
+                    昵称：
                 </div>
                 <div class="box">
                     <div class="con">
-                        <input type="password" v-model="form.oldPassword" :disabled="true"/>
+                        <input
+                            type="text"
+                            v-model="user.userName"
+                            :disabled="true"
+                        />
+                    </div>
+                </div>
+                <div class="tool">
+                    <span class="link" @click="setName">修改</span>
+                </div>
+            </section>
+            <section class="form-item">
+                <div class="label">
+                    <span class="required hide">*</span>
+                    店铺：
+                </div>
+                <div class="box">
+                    <div class="con">
+                        <input
+                            type="text"
+                            v-model="user.storeName"
+                            :disabled="true"
+                        />
+                    </div>
+                </div>
+            </section>
+            <section class="form-item">
+                <div class="label">
+                    <span class="required hide">*</span>
+                    角色：
+                </div>
+                <div class="box">
+                    <div class="con">
+                        <input
+                            type="text"
+                            :value="user.roleId | roleFilter"
+                            :disabled="true"
+                        />
                     </div>
                 </div>
             </section>
         </div>
+
+        <uni-popup ref="popup" type="dialog">
+            <uni-popup-dialog
+                mode="input"
+                :title="'新昵称'"
+                :content="false"
+                :inputType="'text'"
+                placeholder="请输入新昵称"
+                @confirm="popupConfirm"
+            ></uni-popup-dialog>
+        </uni-popup>
     </div>
 </template>
 
 <script>
 import MyImage from "../../../components/image/index";
 import EasyUpload from "../../../components/easy-upload/easy-upload-media";
-
+import uniPopup from "../../../components/uni-popup/uni-popup";
+import uniPopupDialog from "../../../components/uni-popup/uni-popup-dialog";
+let roleObj = {
+    "75b71b24-25de-40ac-a866-c8f5555b8b92": "超级管理员",
+    "26b2d3be-be4a-489f-839b-d50fdac0f2f4": "客服人员",
+    "bfbde5df-9922-410f-bab2-158402d3d98d": "财务工作人员",
+    "f68b8e48-c681-467b-af76-e1612c26d62e": "主播人员",
+    "c67011ac-f79c-4d0b-a7c3-24e5b8319056": "运营人员",
+    "50c41c5d-b54c-43ed-b587-10dcb60e72e5": "店铺管理员",
+    "731d7667-d68c-4b15-9080-4a96775a5606": "多门店管理员",
+};
 export default {
     name: "",
-    components: { MyImage, EasyUpload },
+    components: { MyImage, EasyUpload,uniPopup, uniPopupDialog },
+    filters: {
+        roleFilter(v) {
+            let name = roleObj[v];
+            return name || "";
+        },
+    },
     // 数据
     data() {
         return {
@@ -31,13 +95,63 @@ export default {
         };
     },
 
-    onLoad(opts) {},
+    onLoad(opts) {
+        console.log(this.user);
+        this.getUser();
+    },
 
     onShow() {},
 
     // 函数
     methods: {
-    
+        setName() {
+            this.$refs.popup.open({
+                type: "dialog",
+            });
+        },
+
+        popupConfirm(done, value) {
+            if (!value) {
+                return this.fn.showToast("请输入新昵称");
+            }
+            uni.showLoading({
+                title: "提交中...",
+                mask: true,
+            });
+            this.api
+                .post(
+                    "/User/SetNickName",
+                    {
+                        nickName: value,
+                        query: true,
+                    },
+                    { pass: true }
+                )
+                .then((res) => {
+                    this.submitLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("修改成功");
+                        let user = { ...this.user };
+                        user.userName = value;
+                        this.$store.commit("user/update", {
+                            user,
+                        });
+                    } else {
+                        this.fn.showModal({
+                            content: res.message,
+                            showCancel: false,
+                            title: "修改失败",
+                        });
+                    }
+                    done();
+                });
+        },
+        getUser() {
+            this.api.get("/Login/GetUserInfo").then((res) => {
+                console.log(res);
+            });
+        },
     },
 
     // 数据计算
@@ -270,4 +384,7 @@ export default {
     font-size: px(44);
     vertical-align: bottom;
 }
+.link {
+    color: #409eff;
+}
 </style>

src/pages/manage/user/password.vue

@@ -115,6 +115,7 @@ export default {
             this.$store.commit("user/logout", null);
             this.router.replace({
                 path: "/pages/index/login",
+                isReLaunch:true
             });
         },
     },

src/pages/manage/user/phone.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page" :class="{ 'page--iphoneX': iphoneX }">
         <div class="form-card">
-            <section class="form-item">
+            <!-- <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
                     旧手机号：
@@ -30,7 +30,7 @@
                         >{{ codeStr }}</span
                     >
                 </div>
-            </section>
+            </section> -->
             <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
@@ -58,8 +58,8 @@ export default {
     data() {
         return {
             form: {
-                phone: "",
-                code: "",
+                // phone: "",
+                // code: "",
                 newPhone: "",
             },
             submitLoading: false,
@@ -110,12 +110,12 @@ export default {
             if (this.submitLoading) {
                 return;
             }
-            if (!this.form.phone) {
-                return this.fn.showToast("请输入旧手机号");
-            }
-            if (!this.form.code) {
-                return this.fn.showToast("请输入验证码");
-            }
+            // if (!this.form.phone) {
+            //     return this.fn.showToast("请输入旧手机号");
+            // }
+            // if (!this.form.code) {
+            //     return this.fn.showToast("请输入验证码");
+            // }
             if (!this.form.newPhone) {
                 return this.fn.showToast("请输入新手机号");
             }
@@ -126,19 +126,19 @@ export default {
                 title: "提交中...",
                 mask: true,
             });
-            let data = { ...this.form, userId: this.user.id, query: true };
-            delete data.newPassword2;
+            let data = { mobile: this.form.newPhone, query: true };
+            // delete data.newPassword2;
             this.submitLoading = true;
 
             this.api
-                .post("/Login/ChangePwd", data, { pass: true })
+                .post("/User/SetMobile", data, { pass: true })
                 .then((res) => {
                     this.submitLoading = false;
                     uni.hideLoading();
                     if (res.success) {
                         this.fn.showToast("修改成功");
                         setTimeout(() => {
-                            this.layout();
+                            this.router.back();
                         }, 500);
                     } else {
                         this.fn.showModal({
@@ -154,6 +154,7 @@ export default {
             this.$store.commit("user/logout", null);
             this.router.replace({
                 path: "/pages/index/login",
+                isReLaunch:true
             });
         },
     },