bug修改

src/pages/user/bindMobile/bindMobile.vue

@@ -10,7 +10,7 @@
           <input type="tel" maxlength="11" placeholder="手机号" v-model="postData.phone">
         </div>
 
-        <div class="recommend">
+        <!-- <div class="recommend">
           <span>推荐人</span>
           <div @click="selectCase">
             <span>{{caseName}}</span>
@@ -20,7 +20,7 @@
             <span>{{salesName}}</span>
             <i class="iconfont icon-triangle-bottom"></i>
           </div>
-        </div>
+        </div> -->
 
         <div class="sms">
           <i class="iconfont icon-mima"></i>
@@ -29,11 +29,16 @@
           <div class="sand" v-else>{{seconds}}后可重发</div>
         </div>
 
+        <div class="mobile">
+          <i class="iconfont icon-mima"></i>
+          <input type="tel" maxlength="11" placeholder="推荐码" v-model="postData.recommend">
+        </div>
+
         <div class="submit" @click="submit">
           <div>提交</div>
         </div>
       </div>
-      <transition name="slide">
+      <!-- <transition name="slide">
         <div class="select" v-if="showCase">
           <van-picker
             show-toolbar
@@ -56,7 +61,7 @@
             @confirm="onConfirmS"
           />
         </div>
-      </transition>
+      </transition> -->
     </div>
   </div>
 </template>
@@ -81,7 +86,8 @@ export default {
         phone: '',
         case: '',
         sales: '',
-        captcha: ''
+        captcha: '',
+        recommend: ''
       }
     }
   },
@@ -100,51 +106,51 @@ export default {
     ...actions(['getCaseInfo']),
     ...actions(['getCaptcha']),
     ...actions(['submitData']),
-    onConfirmC (value, index) {
-      this.caseName = value.CaseName
-      this.postData.case = value.CaseId
-      this.columnsS = []
-      this.salesName = '选择销售'
-      if (this.caseInfo.sales) {
-        for (let i = 0; i < this.caseInfo.sales.length; i++) {
-          if (this.caseInfo.sales[i].CaseId === this.postData.case) {
-            this.columnsS.push(this.caseInfo.sales[i])
-          }
-        }
-      }
-      if (this.caseInfo.manager) {
-        for (let i = 0; i < this.caseInfo.manager.length; i++) {
-          if (this.caseInfo.manager[i].CaseId === this.postData.case) {
-            this.columnsS.push(this.caseInfo.manager[i])
-          }
-        }
-      }
-      this.showCase = false
-    },
-    onCancelC () {
-      this.showCase = false
-    },
-    onConfirmS (value, index) {
-      this.salesName = value.UserName
-      this.postData.sales = value.UserId
-      this.showSales = false
-    },
-    onCancelS () {
-      this.showSales = false
-    },
-    selectCase () {
-      this.showCase = true
-    },
-    selectSales () {
-      if (!this.postData.case) {
-        this.$toast('请先选择案场')
-        return
-      } else if (this.columnsS.length <= 0) {
-        this.$toast('此案场无销售')
-        return
-      }
-      this.showSales = true
-    },
+    // onConfirmC (value, index) {
+    //   this.caseName = value.CaseName
+    //   this.postData.case = value.CaseId
+    //   this.columnsS = []
+    //   this.salesName = '选择销售'
+    //   if (this.caseInfo.sales) {
+    //     for (let i = 0; i < this.caseInfo.sales.length; i++) {
+    //       if (this.caseInfo.sales[i].CaseId === this.postData.case) {
+    //         this.columnsS.push(this.caseInfo.sales[i])
+    //       }
+    //     }
+    //   }
+    //   if (this.caseInfo.manager) {
+    //     for (let i = 0; i < this.caseInfo.manager.length; i++) {
+    //       if (this.caseInfo.manager[i].CaseId === this.postData.case) {
+    //         this.columnsS.push(this.caseInfo.manager[i])
+    //       }
+    //     }
+    //   }
+    //   this.showCase = false
+    // },
+    // onCancelC () {
+    //   this.showCase = false
+    // },
+    // onConfirmS (value, index) {
+    //   this.salesName = value.UserName
+    //   this.postData.sales = value.UserId
+    //   this.showSales = false
+    // },
+    // onCancelS () {
+    //   this.showSales = false
+    // },
+    // selectCase () {
+    //   this.showCase = true
+    // },
+    // selectSales () {
+    //   if (!this.postData.case) {
+    //     this.$toast('请先选择案场')
+    //     return
+    //   } else if (this.columnsS.length <= 0) {
+    //     this.$toast('此案场无销售')
+    //     return
+    //   }
+    //   this.showSales = true
+    // },
     sandMsg () {
       if (!this.postData.phone) {
         this.$toast('请先填写手机号')

src/pages/user/orderList/index.vue

@@ -82,7 +82,7 @@ export default {
       from: this.$route.query.from || ''
     }).then((res) => {
       // console.log(JSON.stringify(res))
-      if(res.list === null){
+      if (res.list === null) {
         this.noData = true
       }
     })
@@ -96,11 +96,12 @@ export default {
       Math.ceil(this.orders.pagenum / this.orders.pagesize) > this.page ? this.hasMore = true : this.hasMore = false
       // this.list.length <= 8 ? this.hasMore = true : this.hasMore = false
       if (this.hasMore) {
-        this.page = this.page+1
+        this.page = this.page + 1
         setTimeout(() => {
           _that.getCustomerGoodsOrder({
             page: _that.page,
             pagesize: _that.pagesize,
+            from: this.$route.query.from || ''
           })
         }, 1000)
       } else {
@@ -114,5 +115,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/placeOrder/index.vue

@@ -319,7 +319,7 @@ export default {
 
           // })
         }).catch(() => {
-          this.ajaxoff = true
+          this.ajaxOff = true
         })
       }
     },

src/pages/user/placeOrderDetail/index.vue

@@ -247,7 +247,7 @@ export default {
           //   window.history.go(-2)
           // })
         }).catch(() => {
-          this.ajaxoff = true
+          this.ajaxOff = true
         })
       }
     },