Merge branch 'develop' of gitlab2.dui88.com:jiangsizhi/duiba-h5-frame into feature/20190401-modal

build/ossupload.js

@@ -14,6 +14,7 @@ const chalk = require('chalk');
 const ProgressBar = require('progress');
 const path = require('path');
 let NODE_ENV = process.env.NODE_ENV;
+let config = require("../config/index");
 
 function replaceBackSlash(str) {
   let n = str.split('\\').length - 1;
@@ -70,7 +71,7 @@ class OssUpload {
     co(function*() {
       let relativeDir = _this.getRelativePath(fileDir);
       const originPath = `${_this.options.originDir}${relativeDir}`; // cdn 路径
-      console.log("上传文件 http://yun.dui88.com/" + originPath);
+      console.log("上传文件 " + config.build.assetsPublicPath + originPath);
       try {
         originFile = yield _this.client.head(originPath);
       } catch (error) {

src/pages/kejiji/webview/content/page/home.vue

@@ -119,7 +119,8 @@ export default {
       subTitle2: "",
       activitLyist: [],
       weixinQrcode: '',
-      showInterceptModal: false
+      showInterceptModal: false,
+      sellerId: ""
     };
   },
   props: {
@@ -136,7 +137,9 @@ export default {
       this.showInterceptModal = false;
     },
     goCardEditPage() {
-      wx.miniProgram.navigateTo({url: '/pages/sellercard/card_edit/main'});
+      wx.miniProgram.navigateTo({
+        url: '/pages/sellercard/card_edit/main?sellerId=' + this.sellerId
+      });
     },    
     async showToday() {
       // this.$router.push("/today");
@@ -171,9 +174,16 @@ export default {
       }
     },
     async getuserInfo() {
+      console.log("getuserInfo");
       let res = await get(API.userInfo, {});
       if (res.success) {
         this.weixinQrcode = res.data.sellerWxQrCode;
+        this.sellerId = res.data.sellerId;
+      }
+      else{
+        if(res.code == "100010"){
+          this.getH5Authorize();
+        }
       }
     },
     async initData(){

src/pages/kejiji/webview/daily/page/today.less

@@ -3,7 +3,7 @@
   font-size: 12px;
   width: 100%;
   overflow-x: hidden;
-  padding-bottom: 90px;
+  padding-bottom: 80px;
   opacity: 0;
   // animation: fades 0.7s 1;
   // animation-delay: 0.4s;
@@ -30,6 +30,9 @@
     animation-delay: 0.4s;
     animation-fill-mode: forwards;
   }
+  &.mini{
+    padding-bottom: 160px;
+  }
 }
 
 @keyframes fades{
@@ -393,7 +396,7 @@
   }
   .long-touch{
     position: absolute;
-    right: 32px;
+    right: 72px;
     bottom: -60px;
     font-size: 26px;
     color: #999999;

src/pages/kejiji/webview/daily/page/today.vue

 <template>
-  <div class="page" :class="{active:loaded}">
+  <div class="page" :class="{active:loaded, mini:inMini}">
     <div class="title">{{title}}</div>
     <div class="seller-tip"><span class="seller-name">{{sellerName}}</span>的分享</div>
     <div class="rili">
@@ -68,7 +68,7 @@
           </div>
         </div>
       </div>
-      <div class="long-touch"><div class="long-line"></div>长按扫描联系TA</div>
+      <div class="long-touch"><div class="long-line"></div>{{wechatQrCode?"长按二维码联系TA":"暂无二维码信息"}}</div>
     </div>
     
 
@@ -118,7 +118,8 @@ export default {
       avatar: "",
       wechatQrCode: "",
       loaded: false,
-      sellerId: null
+      sellerId: null,
+      inMini: false
     };
   },
   components: {ShareFooter, toastTip},
@@ -241,6 +242,7 @@ export default {
     }
   },
   created() {
+    this.inMini = inMiniprogram;
     this.initData();
     startTime(SCID);
   }