feats

src/pages/signup.vue

@@ -22,19 +22,13 @@
         <input class="phone" type="text" placeholder="请输入手机号" v-model="formData.phone" />
       </div>
       <div class="formItem intendedProductdiv" @click="showPicker = true">
-        <label>意向产品</label>        
-        <input
-          class="intendedProduct"
-          type="text"
-          placeholder="请选择"
-          disabled
-          v-model="formData.intendedProduct"
-        />
+        <label>意向产品</label>
+        <div class="intendedProduct" :class="{grey: !address}">{{formData.intendedProduct || "请选择"}}</div>
       </div>
 
       <div class="formItem addressdiv" @click="showArea = true">
         <label>所在地区</label>
-        <input class="address" type="text" placeholder="请选择" v-model="address" disabled />
+        <div class="address" :class="{grey: !address}">{{address || "请选择"}}</div>
       </div>
       <img @click="sumbit" class="submit" src="../../public/images/signup/submit.png" width="45%" />
     </div>
@@ -149,9 +143,11 @@ export default {
           phone: phone,
           interestTo: intendedProduct
         }).then((e) => {
+          this.$router.replace('/resultPage')
           console.log(e)
+        }).catch(e => {
+          alert(e.message)
         })
-        this.$router.replace('/resultPage')
       }
     }
   }
@@ -232,6 +228,9 @@ export default {
   font-size: 16px;
   color: #a6b1ab;
   float: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space:nowrap;
 }
 .addressdiv {
   margin-top: 74%;
@@ -247,7 +246,15 @@ export default {
   font-size: 16px;
   color: #a6b1ab;
   float: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space:nowrap;
 }
+
+.grey {
+  color: #696f69;
+}
+
 .submit {
   margin: 93% 0 0 27.5vw;
 }

src/utils/initial.js

@@ -38,7 +38,7 @@ export function share (opt) {
   // const defaultLink = origin + pathname
   const defaultImg = `${origin}${pathname}images/share.png`
 
-  const link = window.location.href
+  const link = origin + pathname + search // window.location.href
   const imgUrl = opt.imgUrl || defaultImg
 
   initSDK(link)
@@ -116,7 +116,7 @@ export function redirect (force) {
   if (process.env.NODE_ENV === 'development') return;
 
   const originCode = localStorage.getItem('wxcode');
-  const wxfirst = localStorage.getItem('wxfirst') || true;
+  const wxfirst = localStorage.getItem('wxfirst') === null;
   const queryCode = getCode();
  
   localStorage.setItem('wxcode', queryCode)