no message

src/packageHome/pages/addvalue/websiteList.vue

@@ -1,96 +1,76 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout
     :isScroll="true"
     :refresherTriggered="refresherTriggered"
     @refresherrefresh="refresherrefresh"
-    @scrolltolower="scrolltolower">
+    @scrolltolower="scrolltolower"
+  >
     <view class="list-container">
-      <view class="item" v-for="(item,index) in dataList" :key="index">
+      <view class="item" v-for="(item, index) in dataList" :key="index">
         <view class="title">网点信息</view>
         <view class="row">
           <view class="label">网点名称</view>
-          <view class="value">{{item.name}}</view>
+          <view class="value">{{ item.name }}</view>
         </view>
         <view class="row">
           <view class="label">联系人</view>
-          <view class="value">{{item.linkName}}</view>
+          <view class="value">{{ item.linkName }}</view>
         </view>
         <view class="row">
           <view class="label">联系电话</view>
           <view class="value">
-		  	{{item.websitPhone}}
-		  	<view class="fun" @tap.stop="$callPhone(item.websitPhone)">
-		  	  <text class="iconfont icon-call"></text>
-		  	  <view class="text">联系Ta</view>
-		  	</view>
-		  </view>
+            {{ item.websitPhone }}
+            <view class="fun" @tap.stop="$callPhone(item.websitPhone)">
+              <text class="iconfont icon-call"></text>
+              <view class="text">联系Ta</view>
+            </view>
+          </view>
         </view>
         <view class="row">
           <view class="label">联系地址</view>
-          <view class="value">{{item.address}}</view>
+          <view class="value">{{ item.address }}</view>
         </view>
       </view>
     </view>
-	<Loading :loadStatus="dataList.length>0?2:3" :dataList="dataList"/>
+    <Loading :loadStatus="dataList.length > 0 ? 2 : 3" :dataList="dataList" />
   </zj-page-layout>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view :src="webViewHref(`/packageHome/pages/addvalue/websiteList`, pam, crossPagePam)" @message="crossPage.$listener"></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-  // #ifdef H5
-  export default {
-    data() {
-      return {
-        refresherTriggered: false,
-		dataList: []
-      }
-    },
-
-    onLoad() {
-      this.getList();
-    },
-
-    methods: {
-      getList() {
-      	this.$api.get('/user/apply/websit', {
-      		isIncre: true,
-			isAll: true
-      	}).then(res => {
-      		this.refresherTriggered = false;
-      		this.dataList = res.data
-      	})
-      },
-
-      // 下拉刷新
-      refresherrefresh() {
-		this.getList()
-      },
+export default {
+  data() {
+    return {
+      refresherTriggered: false,
+      dataList: []
+    }
+  },
 
-      // 触底加载
-      scrolltolower() {
+  onLoad() {
+    this.getList()
+  },
 
-      }
+  methods: {
+    getList() {
+      this.$api
+        .get('/user/apply/websit', {
+          isIncre: true,
+          isAll: true
+        })
+        .then(res => {
+          this.refresherTriggered = false
+          this.dataList = res.data
+        })
     },
-  }
 
-  // #endif
-  // #ifndef H5
-  export default {
-    data() {
-      return {
-        pam: {},
-      }
+    // 下拉刷新
+    refresherrefresh() {
+      this.getList()
     },
-    onLoad(pam) {
-      this.pam = pam;
-    }
+
+    // 触底加载
+    scrolltolower() {}
   }
-  // #endif
+}
 </script>
 
 <style lang="scss" scoped>
@@ -113,25 +93,25 @@
       }
       .value {
         font-size: 28rpx;
-		display: flex;
+        display: flex;
+      }
+    }
+    .fun {
+      flex-shrink: 0;
+      display: flex;
+      align-items: center;
+      padding: 0 20rpx;
+
+      .iconfont {
+        color: $theme-color;
+        margin-right: 6rpx;
+      }
+
+      .text {
+        font-size: 28rpx;
+        color: $theme-color;
       }
     }
-	.fun {
-	  flex-shrink: 0;
-	  display: flex;
-	  align-items: center;
-	  padding: 0 20rpx;
-	
-	  .iconfont {
-	    color: $theme-color;
-	    margin-right: 6rpx;
-	  }
-	
-	  .text {
-	    font-size: 28rpx;
-	    color: $theme-color;
-	  }
-	}
   }
 }
 </style>

src/packageWorkorder/pages/create/index.vue

@@ -8,8 +8,13 @@
             <view class="icon"><text class="iconfont icon-dingwei1"></text></view>
             <view class="nodata" v-if="!addressInfo">选择联系人地址</view>
             <view class="hasdata" v-else>
-              <view class="name">{{addressInfo.name}}<text>{{addressInfo.phone}}</text></view>
-              <view class="address ellipsis-2">{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.area}}{{addressInfo.street}}{{addressInfo.address}}{{addressInfo.houseNo}}</view>
+              <view class="name"
+                >{{ addressInfo.name }}<text>{{ addressInfo.phone }}</text></view
+              >
+              <view class="address ellipsis-2"
+                >{{ addressInfo.province }}{{ addressInfo.city }}{{ addressInfo.area }}{{ addressInfo.street
+                }}{{ addressInfo.address }}{{ addressInfo.houseNo }}</view
+              >
             </view>
           </view>
           <text class="right iconfont icon-jinru"></text>
@@ -20,12 +25,12 @@
         <view class="common-title">服务信息</view>
         <view class="item">
           <view class="label"><text>*</text>工单类型</view>
-          <view class="value">{{typeName}}</view>
+          <view class="value">{{ typeName }}</view>
         </view>
         <view class="item" v-if="isWorkerUser">
           <view class="label"><text>*</text>所属网点</view>
           <view class="picker" @tap="isShowWebsitDialog = true">
-            <text class="value" v-if="websit">{{websit.name}}</text>
+            <text class="value" v-if="websit">{{ websit.name }}</text>
             <text class="placeholder" v-else>请选择</text>
             <text class="iconfont icon-jinru"></text>
           </view>
@@ -33,7 +38,7 @@
         <view class="item">
           <view class="label"><text>*</text>预约上门时间</view>
           <view class="picker" @tap="isShowDatePicker = true">
-            <text class="value" v-if="date">{{date}}</text>
+            <text class="value" v-if="date">{{ date }}</text>
             <text class="placeholder" v-else>请选择</text>
             <text class="iconfont icon-jinru"></text>
           </view>
@@ -43,21 +48,23 @@
       <view class="product-container card">
         <view class="title">
           <view class="common-title"><text>*</text>产品信息</view>
-          <view class="right" @tap="toChooseProduct"><u-icon name="plus-circle" color="#3D8FFD" size="18"></u-icon>添加</view>
+          <view class="right" @tap="toChooseProduct"
+            ><u-icon name="plus-circle" color="#3D8FFD" size="18"></u-icon>添加</view
+          >
         </view>
         <view class="list">
           <view class="item" v-for="(item, index) in productList" :key="index">
             <image :src="item.imgUrl" mode="aspectFill"></image>
             <view class="main">
-              <view class="name">{{item.smallName}}</view>
+              <view class="name">{{ item.smallName }}</view>
               <view class="tags">
-                <view class="it">{{item.brandName}}</view>
+                <view class="it">{{ item.brandName }}</view>
               </view>
               <u-number-box min="1" v-model="item.num">
                 <view slot="minus" class="ctrl">
                   <u-icon name="minus" color="#FFFFFF" size="10"></u-icon>
                 </view>
-                <text slot="input" class="input">{{item.num}}</text>
+                <text slot="input" class="input">{{ item.num }}</text>
                 <view slot="plus" class="ctrl">
                   <u-icon name="plus" color="#FFFFFF" size="10"></u-icon>
                 </view>
@@ -77,7 +84,7 @@
 
     <template slot="footer">
       <view class="footer-btn-group">
-      	<u-button text="提交服务单" type="primary" @click="submitData"></u-button>
+        <u-button text="提交服务单" type="primary" @click="submitData"></u-button>
       </view>
     </template>
 
@@ -90,7 +97,8 @@
       :list="websitList"
       :keyName="'name'"
       @cancel="isShowWebsitDialog = false"
-      @confirm="confirmWebsitDialog">
+      @confirm="confirmWebsitDialog"
+    >
     </zjDialogPicker>
 
     <u-datetime-picker
@@ -107,7 +115,7 @@
 </template>
 
 <script>
-import zjDialogPicker from "@/components/zj-dialog/zj-dialog-picker.vue";
+import zjDialogPicker from '@/components/zj-dialog/zj-dialog-picker.vue'
 
 export default {
   components: {
@@ -130,45 +138,45 @@ export default {
 
       productList: [],
 
-      remark: '',
+      remark: ''
     }
   },
 
-  computed:{
-    isWorkerUser() { // 是否师傅
-      return this.userInfo && this.userInfo.type === 'WORKER';
-    },
+  computed: {
+    isWorkerUser() {
+      // 是否师傅
+      return this.userInfo && this.userInfo.type === 'WORKER'
+    }
   },
 
-  async onLoad({typeId, typeName}) {
-    this.typeId = typeId;
-    this.typeName = typeName;
-    this.getWebsitList();
+  async onLoad({ typeId, typeName }) {
+    this.typeId = typeId
+    this.typeName = typeName
+    this.getWebsitList()
 
-    this.userInfo = await this.$getUserInfo();
+    this.userInfo = await this.$getUserInfo()
 
     // 接收地址信息
     this.crossPage.$on('chooseAddress', result => {
-      this.addressInfo = result;
+      this.addressInfo = result
     })
     // 接收产品分类
     this.crossPage.$on('chooseClassify', result => {
-      let index = this.productList.findIndex((item) => item.smallId == result.smallId && item.brandId == result.brandId);
+      let index = this.productList.findIndex(item => item.smallId == result.smallId && item.brandId == result.brandId)
       if (index !== -1) {
-        this.productList.splice(index, 1, result);
+        this.productList.splice(index, 1, result)
       } else {
-        this.productList.push(result);
+        this.productList.push(result)
       }
     })
   },
 
   onUnload() {
-    this.crossPage.$off('chooseAddress');
-    this.crossPage.$off('chooseClassify');
+    this.crossPage.$off('chooseAddress')
+    this.crossPage.$off('chooseClassify')
   },
 
   methods: {
-
     formatter(type, value) {
       if (type === 'year') {
         return `${value}年`
@@ -190,15 +198,14 @@ export default {
     },
 
     getWebsitList() {
-      this.$api.get('/user/apply/websit')
-      .then(res => {
-        this.websitList = res.data;
+      this.$api.get('/user/apply/websit').then(res => {
+        this.websitList = res.data
       })
     },
 
     confirmWebsitDialog(e) {
-      this.websit = this.websitList[e[0]];
-      this.isShowWebsitDialog = false;
+      this.websit = this.websitList[e[0]]
+      this.isShowWebsitDialog = false
     },
 
     toChooseProduct() {
@@ -210,51 +217,58 @@ export default {
     deleteProduct(item, index) {
       this.$modal({
         content: `确定删除${item.smallName}吗？`
-      }).then(() => {
-        this.productList.splice(index, 1);
-      }).catch(() => {})
+      })
+        .then(() => {
+          this.productList.splice(index, 1)
+        })
+        .catch(() => {})
     },
 
     confirmDate(e) {
-      this.isShowDatePicker = false;
-      let time = new Date(e.value);
-      let y = time.getFullYear();
-      let m = (time.getMonth()+1) < 10 ? '0' + (time.getMonth()+1) : time.getMonth()+1;
-      let d = (time.getDate()) < 10 ? '0' + (time.getDate()) : time.getDate();
-      let hh = (time.getHours()) < 10 ? '0' + (time.getHours()) : time.getHours();
-      let mm = (time.getMinutes()) < 10 ? '0' + (time.getMinutes()) : time.getMinutes();
-      let ss = (time.getSeconds()) < 10 ? '0' + (time.getSeconds()) : time.getSeconds();
-      this.date = `${y}-${m}-${d}`;
+      this.isShowDatePicker = false
+      let time = new Date(e.value)
+      let y = time.getFullYear()
+      let m = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1
+      let d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate()
+      let hh = time.getHours() < 10 ? '0' + time.getHours() : time.getHours()
+      let mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()
+      let ss = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds()
+      this.date = `${y}-${m}-${d}`
     },
 
     submitData() {
-      if(!this.addressInfo) return this.$toast('请选择客户信息');
-      if(!this.websit && this.isWorkerUser) return this.$toast('请选择所属网点');
-      if(!this.date) return this.$toast('请选择预约上门时间');
-      if(this.productList.length < 1) return this.$toast('请添加产品信息');
-      if(this.typeName.indexOf('维修') >= 0 && !this.remark) return this.$toast('请填写故障描述');
+      if (!this.addressInfo) return this.$toast('请选择客户信息')
+      if (!this.websit && this.isWorkerUser) return this.$toast('请选择所属网点')
+      if (!this.date) return this.$toast('请选择预约上门时间')
+      if (this.productList.length < 1) return this.$toast('请添加产品信息')
+      if (this.typeName.indexOf('维修') >= 0 && !this.remark) return this.$toast('请填写故障描述')
 
-      this.$api.postJson('/pg/order/base/save', {
-        orderSmallType: this.typeId,
-        userAddressId: this.addressInfo.userAddressId,
-        websitId: this.websit ? this.websit.websitId : '',
-        appointmentTime: this.date + ' 00:00:00',
-        orderProducts: this.productList,
-        remark: this.remark,
-      }).then(res => {
-        this.$successToast();
-        if(this.isWorkerUser) {
-          this.$navToPage({
-            url: `/packageWorkorder/pages/orderList`
-          }, 'redirectTo')
-        }else {
-          this.$navToPage({
-            url: `/packageWorkorder/pages/userWorkorderList`
-          })
-        }
-      })
-    },
-  },
+      this.$api
+        .postJson('/pg/order/base/save', {
+          orderSmallType: this.typeId,
+          userAddressId: this.addressInfo.userAddressId,
+          websitId: this.websit ? this.websit.websitId : '',
+          appointmentTime: this.date + ' 00:00:00',
+          orderProducts: this.productList,
+          remark: this.remark
+        })
+        .then(res => {
+          this.$successToast()
+          if (this.isWorkerUser) {
+            this.$navToPage(
+              {
+                url: `/packageWorkorder/pages/orderList`
+              },
+              'redirectTo'
+            )
+          } else {
+            this.$navToPage({
+              url: `/packageWorkorder/pages/userWorkorderList`
+            })
+          }
+        })
+    }
+  }
 }
 </script>
 
@@ -396,7 +410,7 @@ export default {
           .it {
             font-size: 24rpx;
             color: $theme-color;
-            background: rgba($color: $theme-color, $alpha: .3);
+            background: rgba($color: $theme-color, $alpha: 0.3);
             padding: 8rpx 12rpx;
             border-radius: 8rpx;
           }

src/pages/index/index.vue

@@ -283,7 +283,7 @@
                 <view class="address">{{ item.address }}</view>
               </view>
             </view>
-            <view class="item" @tap="isShowContact2 = !isShowContact2">
+            <!-- <view class="item" @tap="isShowContact2 = !isShowContact2">
               <image src="@/static/images/home/home-icon3.png"></image>
               <view class="title">投诉热线</view>
               <text class="iconfont icon-jinru"></text>
@@ -293,7 +293,7 @@
               <view class="right" @tap="$callPhone(userInfo.companyWechatMobile)" v-if="userInfo.companyWechatMobile"
                 ><text class="iconfont icon-call"></text
               ></view>
-            </view>
+            </view> -->
           </view>
         </view>
       </view>
@@ -808,7 +808,8 @@ export default {
     getWebsitList() {
       this.$api
         .get('/user/apply/websit', {
-          isAll: false
+          // isAll: false,
+          examineStatus: 'OK'
         })
         .then(res => {
           this.websitList = res.data || []