no message

src/packageMaterial/pages/apply/order.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout :hasFooter="true">
     <view class="all-container">
       <view class="common-title">订单信息</view>
@@ -52,18 +51,9 @@
       </view>
     </template>
   </zj-page-layout>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/apply/order`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 import wx from 'weixin-js-sdk'
 export default {
   data() {
@@ -78,7 +68,7 @@ export default {
       lng: '',
       websitData: null,
       userInfo: {},
-      remark: '',
+      remark: ''
     }
   },
 
@@ -88,83 +78,73 @@ export default {
       // this.goodsList.forEach(item => {
       //   val = val + item.num;
       // })
-      return this.goodsList.length;
+      return this.goodsList.length
     },
     totalPrice() {
-      let val = 0;
+      let val = 0
       this.goodsList.forEach(item => {
-        val = val + (item.num * (item.price * 100) / 100);
+        val = val + (item.num * (item.price * 100)) / 100
       })
-      return  val;
-    },
+      return val
+    }
   },
 
   async onLoad() {
-    let data = this.$getStorage('materialApplyData');
-    if(data) {
-      this.type = data.type;
-      this.applyName = data.applyName;
-      this.websitId = data.websitId;
-      this.websitName = data.websitName;
-      this.goodsList = data.goodsList;
+    let data = this.$getStorage('materialApplyData')
+    if (data) {
+      this.type = data.type
+      this.applyName = data.applyName
+      this.websitId = data.websitId
+      this.websitName = data.websitName
+      this.goodsList = data.goodsList
     }
-    this.$removeStorage('materialApplyData');
+    // this.$removeStorage('materialApplyData')
 
-    this.userInfo = await this.$getUserInfo();
-    var {latitude,longitude } = await this.$getLocation()
-    this.lat = latitude;
-    this.lng = longitude;
-    this.getWebsitList();
+    this.userInfo = await this.$getUserInfo()
+    var { latitude, longitude } = await this.$getLocation()
+    this.lat = latitude
+    this.lng = longitude
+    this.getWebsitList()
   },
 
   methods: {
     getWebsitList() {
-      this.$api.get('/user/apply/websit', {
-        lat: this.lat,
-        lng: this.lng,
-      }).then(res => {
-        this.websitData = res.data.find(o => o.websitId == this.websitId)
-      })
+      this.$api
+        .get('/user/apply/websit', {
+          lat: this.lat,
+          lng: this.lng
+        })
+        .then(res => {
+          this.websitData = res.data.find(o => o.websitId == this.websitId)
+        })
     },
 
     submitData() {
-      this.$api.postJson('/material/salses/add', {
-        goodsType: this.type,
-        remark: this.remark,
-        workerId: this.userInfo.userId,
-        workerName: this.userInfo.nickName,
-        companyWechatId: this.userInfo.companyWechatId,
-        websitId: this.websitId,
-        websitName: this.websitName,
-        websitBuyGoods: this.goodsList,
-      }).then(res => {
-        this.$navToPage(
+      this.$api
+        .postJson('/material/salses/add', {
+          goodsType: this.type,
+          remark: this.remark,
+          workerId: this.userInfo.userId,
+          workerName: this.userInfo.nickName,
+          companyWechatId: this.userInfo.companyWechatId,
+          websitId: this.websitId,
+          websitName: this.websitName,
+          websitBuyGoods: this.goodsList
+        })
+        .then(res => {
+          this.$navToPage(
             {
               url: `/packageMaterial/pages/stock/buyRecord`
             },
             'reLaunch'
           )
-        // this.$navToPage({
-        //   url: `/packageMaterial/pages/apply/pay?orderId=${res.data}&websitId=${this.websitId}&goodsType=${this.type}`
-        // })
-      })
-    },
-  },
-}
-
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
+          // this.$navToPage({
+          //   url: `/packageMaterial/pages/apply/pay?orderId=${res.data}&websitId=${this.websitId}&goodsType=${this.type}`
+          // })
+        })
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/apply/product.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout :hasFooter="true">
     <template slot="header">
       <view class="search-container">
@@ -124,18 +123,9 @@
       </view>
     </template>
   </zj-page-layout>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/apply/product`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 export default {
   data() {
     return {
@@ -144,13 +134,13 @@ export default {
       websitId: null,
       websitName: null,
       keyword: '',
-		leftList: [],
-		leftCurrent: 0,
-		rightList: [],
+      leftList: [],
+      leftCurrent: 0,
+      rightList: [],
       loadStatus: 0,
       isShowDialog: false,
 
-      cartList: [],
+      cartList: []
     }
   },
 
@@ -160,173 +150,167 @@ export default {
       // this.cartList.forEach(item => {
       //   val = val + item.num;
       // })
-      return this.cartList.length;
+      return this.cartList.length
     },
     totalPrice() {
-      let val = 0;
+      let val = 0
       this.cartList.forEach(item => {
-        val = val + (item.num * (item.price * 100) / 100);
+        val = val + (item.num * (item.price * 100)) / 100
       })
-      return val;
-    },
+      return val
+    }
   },
 
-  onLoad({type, applyName, websitId, websitName}) {
-    this.type = type;
-    this.applyName = applyName;
-    this.websitId = websitId;
-    this.websitName = websitName;
+  onLoad({ type, applyName, websitId, websitName }) {
+    this.type = type
+    this.applyName = applyName
+    this.websitId = websitId
+    this.websitName = websitName
 
     uni.setNavigationBarTitle({
-    　title: type == 'M' ? '选择辅材' : '选择配件'
+      title: type == 'M' ? '选择辅材' : '选择配件'
     })
-    if(type === 'M') {
-      this.getLeftList();
-    }else {
-      this.getRightList();
+    if (type === 'M') {
+      this.getLeftList()
+    } else {
+      this.getRightList()
     }
   },
 
   methods: {
     // 获取左侧分类
     getLeftList() {
-    	this.$api.post('/material/salses/exist/stock/category', {
-        websitId: this.websitId,
-      }).then(res => {
-    		this.leftList = res.data;
-    		this.leftCurrent = res.data.length > 0 ? res.data[0].categoryId : 0;
-    		this.getRightList();
-    	})
+      this.$api
+        .post('/material/salses/exist/stock/category', {
+          websitId: this.websitId
+        })
+        .then(res => {
+          this.leftList = res.data
+          this.leftCurrent = res.data.length > 0 ? res.data[0].categoryId : 0
+          this.getRightList()
+        })
     },
 
     // 获取右侧产品
     getRightList() {
-    	this.loadStatus = 1;
-      let url = '', params = {};
-    	this.$api.post('/material/salses/exist/stock/goods', {
-        websitId: this.websitId,
-        goodsName: this.keyword,
-        type: this.type,
-        categoryId: this.type === 'M' ? this.leftCurrent : '',
-    	}).then(res => {
-    		this.loadStatus = 0;
-        let list = res.data.map(item => {
-          return {
-            ...item,
-            num: 0,
-          }
-        });
-        for(let i = 0; i < list.length; i++) {
-          for(let j = 0; j < this.cartList.length; j++) {
-            if(list[i].goodsId == this.cartList[j].goodsId) {
-              list[i].num = this.cartList[j].num;
+      this.loadStatus = 1
+      let url = '',
+        params = {}
+      this.$api
+        .post('/material/salses/exist/stock/goods', {
+          websitId: this.websitId,
+          goodsName: this.keyword,
+          type: this.type,
+          categoryId: this.type === 'M' ? this.leftCurrent : ''
+        })
+        .then(res => {
+          this.loadStatus = 0
+          let list = res.data.map(item => {
+            return {
+              ...item,
+              num: 0
+            }
+          })
+          for (let i = 0; i < list.length; i++) {
+            for (let j = 0; j < this.cartList.length; j++) {
+              if (list[i].goodsId == this.cartList[j].goodsId) {
+                list[i].num = this.cartList[j].num
+              }
             }
           }
-        }
-    		if(list.length < 1){
-    			this.loadStatus = 2;
-    		}
-        this.rightList = list;
-        console.log(list,"---------------")
-    	}).catch(() => {
-    		this.loadStatus = 2;
-    	})
+          if (list.length < 1) {
+            this.loadStatus = 2
+          }
+          this.rightList = list
+          console.log(list, '---------------')
+        })
+        .catch(() => {
+          this.loadStatus = 2
+        })
     },
 
     // 切换一级菜单
     changeLeft(pid) {
-    	this.leftCurrent = pid;
-    	this.getRightList();
+      this.leftCurrent = pid
+      this.getRightList()
     },
 
     // 搜索
     searchData() {
-      this.getRightList();
+      this.getRightList()
     },
 
     changeNum(e) {
-      let obj = this.rightList.find((item) => item.goodsId === e.name);
-      if(e.unit && e.unit != '米') {
-        e.value = Math.floor(e.value);
-        obj.num = Math.floor(obj.num);
+      let obj = this.rightList.find(item => item.goodsId === e.name)
+      if (e.unit && e.unit != '米') {
+        e.value = Math.floor(e.value)
+        obj.num = Math.floor(obj.num)
       }
       // 判断对象数组中是否存在该对象
-      let index = this.cartList.findIndex((item) => item.goodsId === obj.goodsId);
+      let index = this.cartList.findIndex(item => item.goodsId === obj.goodsId)
       // 如果是0，就删除
-      if(index !== -1 && e.value == 0) {
-        this.cartList.splice(index, 1);
+      if (index !== -1 && e.value == 0) {
+        this.cartList.splice(index, 1)
       }
       // 如果有就替换，没有就添加
       else if (index !== -1) {
-      	this.cartList.splice(index, 1, obj);
-      }
-      else {
-        if(e.value > 0) {
-          this.cartList.push(obj);
+        this.cartList.splice(index, 1, obj)
+      } else {
+        if (e.value > 0) {
+          this.cartList.push(obj)
         }
       }
     },
 
     changeCartNum(e) {
-      let obj = this.cartList.find((item) => item.goodsId === e.name);
-      if(e.unit && e.unit != '米') {
-        e.value = Math.floor(e.value);
-        obj.num = Math.floor(obj.num);
+      let obj = this.cartList.find(item => item.goodsId === e.name)
+      if (e.unit && e.unit != '米') {
+        e.value = Math.floor(e.value)
+        obj.num = Math.floor(obj.num)
       }
-      let index = this.cartList.findIndex((item) => item.goodsId === obj.goodsId);
-      this.cartList.splice(index, 1, obj);
+      let index = this.cartList.findIndex(item => item.goodsId === obj.goodsId)
+      this.cartList.splice(index, 1, obj)
 
-      this.getRightList();
+      this.getRightList()
     },
 
     overlimitFun(index) {
       this.$modal({
         content: '把该产品从购物车移除？'
-      }).then(() => {
-        this.cartList.splice(index, 1);
-        this.getRightList();
-      }).catch(() => {})
+      })
+        .then(() => {
+          this.cartList.splice(index, 1)
+          this.getRightList()
+        })
+        .catch(() => {})
     },
 
     clearCart() {
       this.$modal({
         content: '确定清空购物车？'
-      }).then(() => {
-        this.cartList = [];
-        this.getRightList();
-      }).catch(() => {})
+      })
+        .then(() => {
+          this.cartList = []
+          this.getRightList()
+        })
+        .catch(() => {})
     },
 
     submitData() {
-      if(this.cartList.length < 1) return this.$toast('请选择');
+      if (this.cartList.length < 1) return this.$toast('请选择')
       this.$setStorage('materialApplyData', {
         type: this.type,
         applyName: this.applyName,
         websitId: this.websitId,
         websitName: this.websitName,
         goodsList: this.cartList
-      });
+      })
       this.$navToPage({
         url: `/packageMaterial/pages/apply/order`
       })
-    },
-
-  },
-}
-
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>