Merge branch 'dev' of http://git.izouma.com/panhui/card-wechat into dev

src/components/ProductInfo.vue

@@ -25,7 +25,7 @@
                 <van-button @click.stop="cancelFollow" type="info" plain size="small" v-else-if="showType === 'collect'"
                     >取消关注</van-button
                 >
-                <van-button type="primary" size="small" v-else>立即拼箱</van-button>
+                <van-button type="primary" size="small" v-else-if="info.caseStatus === 'PROGRESS'">立即拼箱</van-button>
             </div>
         </div>
 

src/pages/mine.vue

@@ -160,10 +160,10 @@ export default {
             this.checkAuthen()
                 .then(res => {
                     // this.$http.get('/storeAuthentication/pass/' + res.id);
-                    this.navigateTo('/pages/store/apply');
+                    this.navigateTo('/pages/store/review');
                 })
                 .catch(() => {
-                    this.navigateTo('/pages/store/review');
+                    this.navigateTo('/pages/store/apply');
                 });
         },
         loginMethods() {

src/pages/store/liveProduct.vue

@@ -156,11 +156,25 @@ export default {
                 .then(res => {
                     if (res.roomId) {
                         this.loginMethods(true);
+                    } else {
+                        return Promise.reject();
                     }
                     // this.showImg = true;
                     // this.imgInfo = {
                     //     url: res.codeurl
                     // };
+                })
+                .catch(e => {
+                    this.hideLoading();
+                    wx.showModal({
+                        title: '直播间创建失败',
+                        content: '请检查直播微信号和实名认证结果',
+                        confirmColor: this.$colors.prim,
+                        showCancel: false,
+                        success: res => {
+                            this.navigateBack();
+                        }
+                    });
                 });
         },
         end() {