修改团长号

releaselog.md

@@ -1,5 +1,9 @@
 
 
+# 0.5.0 (21.03.13 12:00) 
+### 完成开店
+
+
 # 0.4.9 (21.03.12 12:00) 
 ### 增加开店
 

src/pages.json

@@ -381,7 +381,7 @@
         {
             "path": "pages/guide/success",
             "style": {
-                "navigationBarTitleText": "开通店铺"
+                "navigationBarTitleText": "开通成功"
             }
         },
         {
@@ -390,6 +390,12 @@
                 "navigationBarTitleText": "协议"
             }
         },
+        {
+            "path": "pages/custom/course",
+            "style": {
+                "navigationBarTitleText": "教程"
+            }
+        },
         {
             "path": "pages/manage/shop/points",
             "style": {

src/pages/custom/course.vue

@@ -0,0 +1,40 @@
+<template>
+    <div class="page">
+        <web-view
+        class="web-view"
+            :src="'https://delivery.ixiaokejia.com/course.html'"
+        ></web-view>
+        <!-- <button class="btn" @click="jump('/pages/guide/success')">确定</button> -->
+    </div>
+</template>
+
+<script>
+export default {
+    name: "",
+
+    // 数据
+    data() {
+        return {
+            url: "",
+        };
+    },
+
+    onShow() {
+        const self = this;
+        self.url = decodeURIComponent(self.$mp.query.url);
+    },
+
+    // 函数
+    methods: {},
+
+    // 数据计算
+    computed: {},
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/pages/custom/webview.vue

@@ -4,7 +4,7 @@
         class="web-view"
             :src="'https://delivery.ixiaokejia.com/open_shop_agreement.html'"
         ></web-view>
-        <button class="btn" @click="jump('/pages/guide/success')">确定</button>
+        <!-- <button class="btn" @click="jump('/pages/guide/success')">确定</button> -->
     </div>
 </template>
 

src/pages/guide/points.vue

@@ -153,8 +153,8 @@ export default {
                     this.submitLoading = false;
                     uni.hideLoading();
                     if (res.success) {
-                        this.fn.showToast("设置成功");
-                        this.router.back();
+                        // this.fn.showToast("设置成功");
+                        this.router.replace('/pages/guide/success');
                     } else {
                         this.fn.showModal({
                             title: "设置错误",

src/pages/guide/success.vue

@@ -1,22 +1,29 @@
 <template>
-    <div class="page tabbar-page">
+    <div class="page">
         <div v-if="!loading" class="success-main">
             <h2 class="success-tit1">恭喜您！</h2>
-            <h2 class="success-tit1">店铺申请通过审核</h2>
-            <h3 class="success-shop-name">店铺名称：xxxx</h3>
+            <h2 class="success-tit1">店铺{{ shopData.name || "" }}</h2>
+            <h3 class="success-tit1">已经开通成功</h3>
+
+            <div class="qrcode">
+                <my-image class="img" :src="qrCode" @click="viewImg"></my-image>
+                <p class="text">{{ shopData.name || "" }}二维码</p>
+            </div>
 
             <div class="success-box">
+                <button class="success-btn" @click="viewShop">
+                    查看店铺
+                </button>
+                <button class="success-btn plain" @click="jump('/pages/custom/course')">
+                    查看教程
+                </button>
                 <p class="success-text">
-                    <checkbox-group @change="checkboxChange">
-                        <checkbox  class="success-checkbox"/>
-                    </checkbox-group>
-                    <a  @click="jump({path:'/pages/custom/webview'})">店铺使用协议</a>
+                    <a @click="jump({ path: '/pages/manage/index',isTabBar:true })"
+                        >返回功能菜单页</a
+                    >
                 </p>
-                <button class="success-btn" @click="jump('/pages/guide/form')">
-                    现在开通
-                </button> 
             </div>
-        </div>
+        </div> 
     </div>
 </template>
 
@@ -30,12 +37,16 @@ export default {
     data() {
         return {
             loading: false,
+            shopData: {},
+            qrCode: "",
         };
     },
     filters: {},
-    onLoad() {},
-    async onShow() {
+    onLoad() {
+        this.getData();
+        this.getQrCode();
     },
+    async onShow() {},
 
     // onPullDownRefresh() {
     //     this.getList();
@@ -43,9 +54,45 @@ export default {
 
     // 函数
     methods: {
-
-        checkboxChange(e){
+        getQrCode(){
+            this.api.get('/Shop/GetQrCode',{width:300})
+                .then(res=>{
+                    this.qrCode = res.data;
+                })
+        },
+        getData() {
+            this.api.get("/Shop/GetInfo", {}, { pass: true }).then((res) => {
+                if (res.success && res.data) {
+                    this.shopData = res.data;
+                } else {
+                    this.fn
+                        .showModal({
+                            content: res.message,
+                            showCancel: false,
+                        })
+                        .then((res) => {
+                            if (res.confirm) {
+                                this.router.back();
+                            }
+                        });
+                }
+            });
+        },
+        checkboxChange(e) {
             console.log(e);
+        },
+
+        viewImg() {
+            uni.previewImage({
+                urls: [this.qrCode],
+                longPressActions: true,
+            });
+        },
+
+        viewShop(){
+            uni.navigateToMiniProgram({
+                appId:'wx7d16ba51271496b8',
+            })
         }
     },
 
@@ -73,14 +120,18 @@ export default {
     justify-content: center;
     align-items: center;
     height: 100%;
-    padding-bottom: 2rem;
-    padding-top: px(300);
+    padding-top: px(100);
 }
 .success-btn {
     color: #fff;
     background-color: rgb(0, 188, 38);
     font-size: px(44);
     width: 100%;
+    &.plain{
+        background-color: transparent;
+        color: #333;
+        border: 1px solid #efefef;
+    }
 }
 .success-tit1 {
     font-size: px(56);
@@ -104,16 +155,19 @@ export default {
 .success-box {
     padding: px(40);
     width: 100%;
-    margin-top: px(300);
+    margin-top: px(80);
+    .success-btn {
+        margin-bottom: px(40);
+    }
     .success-text {
         width: 100%;
         text-align: center;
         color: #409eff;
-        margin-bottom: px(50);
+        margin-bottom: px(60);
         display: flex;
         align-items: center;
         justify-content: center;
-        .success-checkbox{
+        .success-checkbox {
             transform: scale(0.8);
         }
     }
@@ -132,4 +186,23 @@ export default {
 .success-link {
     color: #409eff;
 }
+.qrcode {
+    padding-top: px(100);
+    .img {
+        width: px(550);
+        height: px(550);
+        display: block;
+        margin: 0 auto;
+        /deep/ img {
+            width: px(550);
+            height: px(550);
+        }
+    }
+    .text {
+        margin-top: px(30);
+        font-size: px(40);
+        color: #666;
+        text-align: center;
+    }
+}
 </style>

src/pages/index/register.vue

@@ -389,10 +389,11 @@ export default {
                 .get("/Group/GetGroupInfo", sendData, { pass: true })
                 .then((res) => {
                     if (res.success) {
+                    uni.hideLoading();
                         this.fn
                             .showModal({
                                 title: "团长信息",
-                                content: `当前团长为${res.data.accountName},是否确认提交`,
+                                content: `当前团店铺名称为：${res.data.shopName},是否确认提交`,
                             })
                             .then((res) => {
                                 if (res.confirm) {
@@ -414,7 +415,6 @@ export default {
             this.api
                 .post("/Group/CommitPid", sendData, { pass: true })
                 .then((res) => {
-                    uni.hideLoading();
                     if (res.success) {
                         this.fn.showToast(`团长号提交成功`);
                         this.pidCode = res.data;

src/pages/manage/index.vue

@@ -95,7 +95,7 @@
 
         <!-- <button class="btn" @click="layout">退出登录</button> -->
 
-        <div class="ver">0.4.9</div>
+        <div class="ver">0.5.0</div>
         <wyg-bottom-tab
             ref="tabbar"
             :tabIndex="2"