feat: 提交审核

app.js

@@ -6,6 +6,37 @@ App({
     this.globalData.token = TOKEN
     this.globalData.userId = wx.getStorageSync('userId')
     loginStatus(TOKEN.length > 0)
+
+    const updateManager = wx.getUpdateManager()
+    updateManager.onCheckForUpdate(function (res) {
+      // 请求完新版本信息的回调
+      if (res.hasUpdate) {
+        wx.showLoading({
+          title: '升级中请稍后...',
+        })
+      }
+    })
+
+    updateManager.onUpdateReady(function () {
+      wx.hideLoading()
+      wx.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，请重启应用',
+        showCancel: false,
+        success: function(res){
+          updateManager.applyUpdate()
+        }
+      })
+      
+    })
+    updateManager.onUpdateFailed(function () {
+      // 新版本下载失败
+      wx.hideLoading()
+      wx.showModal({
+        title: '更新提示',
+        content: '更新失败，请检查网络是否可用'
+      })
+    })
   },
   globalData:{
     token: '',

components/order-item/manager-order-item.js

@@ -50,6 +50,9 @@ Component({
     },
     fixDispatchAction(){
       this.triggerEvent("fixDispatchAction",{id: this.data.item.id})
+    },
+    sendOrderAction(){
+      this.triggerEvent("sendOrderAction",{id: this.data.item.id})
     }
   }
 })

components/order-item/manager-order-item.wxml

@@ -35,5 +35,7 @@
     <view class="cp-3" wx:if="{{item.orderStatus == 5 && canFixDisPatch}}" catchtap="fixDispatchAction">重新派单</view>
     <view class="cp-1" wx:if="{{item.orderStatus == 4}}" catchtap="dispatchAction">派单</view>
     <view class="cp-1" wx:if="{{item.orderStatus == 5}}" catchtap="finishAction">完成</view>
+
+    <view class="cp-1" wx:if="{{item.orderStatus == 4 || item.orderStatus == 5}}" catchtap="sendOrderAction">发送订单</view>
   </view>
 </view>
\ No newline at end of file

pages/home/home.js

@@ -208,10 +208,10 @@ Page({
         // 开始创建一个路径
         ctx.beginPath()
         // 画一个圆形裁剪区域
-        ctx.arc(width/2, topHeight + 15 + 40, 40, 0, Math.PI * 2, false)
+        ctx.arc(width/2, topHeight + 30 + 40, 40, 0, Math.PI * 2, false)
         // 裁剪
         ctx.clip()
-        ctx.drawImage(icon, width/2 - 40, topHeight + 15, 80, 80)
+        ctx.drawImage(icon, width/2 - 40, topHeight + 30, 80, 80)
       })
   },
   saveAction(){

pages/home/home.wxml

@@ -47,7 +47,7 @@
   </view>
 </view>
 
-<image class="bottomImage" src="{{data.bottomImage}}" wx:if="{{data.bottomImage}}"/>
+<image class="bottomImage" mode="widthFix" src="{{data.bottomImage}}" wx:if="{{data.bottomImage}}"/>
 
 <image bindtap="getQrcode" class="poster" src="/assets/main/create-poster.png" wx:if="{{roleType == 3}}"/>
 

pages/order/order-detail.wxml

 <!--pages/order/order-detail.wxml-->
-
+<import src="../../templates/send-order-template" />
 <wxs module="statusUtil">
   function backStatusImage(orderStatus) {
     if (orderStatus == 1) {
@@ -122,7 +122,7 @@
   <view class="opt-wrapper">
     <view class="price" wx:if="{{data.price}}">¥{{data.price}}</view>
     <view class="flex-1" />
-    <view class="cp-1" wx:if="{{data.orderStatus == 1 || data.orderStatus == 2}}" bindtap="sendOrder">发送订单</view>
+    <view class="cp-1" wx:if="{{data.orderStatus == 1 || data.orderStatus == 2 || data.orderStatus == 4 || data.orderStatus == 5}}" bindtap="sendOrder">发送订单</view>
     <view class="cp-1" wx:if="{{data.orderStatus == 4 && roleType == 1}}" bindtap="dispatchAction">派单</view>
     <view class="gujia" wx:if="{{data.orderStatus == 1 && roleType == 1}}" bindtap="choosegujia">现场估价</view>
     <view class="gujia" wx:if="{{data.orderStatus == 2 && roleType == 1}}" bindtap="fixgujia">修改估价员</view>
@@ -132,18 +132,4 @@
   </view>
 </view>
 
-<view wx:if="{{overlayVisible}}" class="overlay">
-  <view class="overlay-wrapper">
+<template is="send-order" data="{{overlayVisible,price}}"></template>
\ No newline at end of file
-    <view class="overlay-title">订单发送</view>
-    <view class="overlay-input-wrapper">
-      <input class="overlay-input" placeholder="输入金额" type="digit" model:value="{{price}}"></input>
-      <view class="yuan">元</view>
-    </view>
-    <view class="flex-1"></view>
-    <view class="overlay-line"></view>
-    <view class="overlay-btns">
-      <view class="overlay-btn" bindtap="cancelOverlay">取消</view>
-      <view class="overlay-btn" style="color: #437CFD;" bindtap="overlayAction">确定</view>
-    </view>
-  </view>
-</view>
\ No newline at end of file

pages/order/order-detail.wxss

 /* pages/order/order-detail.wxss */
+@import '../../templates/send-order-template.wxss';
+
 page {
   padding-bottom: calc(140rpx + env(safe-area-inset-bottom));
 }
@@ -347,85 +349,3 @@ page {
   line-height: 60rpx;
   text-align: center;
 }
-
-.overlay {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  left: 0;
-  top: 0;
-  background-color: rgba(0, 0, 0, 0.4);
-  z-index: 99;
-  display: flex;
-  justify-content: center;
-}
-
-.overlay-wrapper {
-  width: 600rpx;
-  height: 368rpx;
-  background: #FFFFFF;
-  border-radius: 24rpx;
-  margin-top: 300rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.overlay-title {
-  width: 100%;
-  height: 124rpx;
-  font-size: 32rpx;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: #3E3E3E;
-  line-height: 124rpx;
-  text-align: center;
-}
-
-.overlay-input-wrapper {
-  width: 408rpx;
-  height: 92rpx;
-  background: #EEEEEE;
-  border-radius: 8rpx;
-  display: flex;
-  flex-direction: row;
-}
-
-.overlay-input {
-  flex: 1;
-  height: 100%;
-  padding: 0 20rpx;
-}
-
-.yuan {
-  width: 92rpx;
-  height: 92rpx;
-  background: #E2E2E2;
-  border-radius: 0px 8rpx 8rpx 0px;
-  text-align: center;
-  line-height: 92rpx;
-}
-
-.overlay-line {
-  width: 598rpx;
-  height: 1px;
-  background-color: #F1F1F1;
-}
-
-.overlay-btns {
-  width: 100%;
-  height: 96rpx;
-  display: flex;
-  flex-direction: row;
-}
-
-.overlay-btn {
-  flex: 1;
-  height: 96rpx;
-  font-size: 32rpx;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 500;
-  color: #3E3E3E;
-  line-height: 96rpx;
-  text-align: center;
-}
\ No newline at end of file

pages/order/order-service.js

@@ -43,6 +43,9 @@ Page({
           tips: res.data.tips
         })
       }
+      that.setData({
+        tips: res.data.tips
+      })
     })
   },
   timeOpen() {

pages/service/service-detail.js

@@ -29,6 +29,7 @@ Page({
   },
   getData(){
     wxGet(ApiServiceDetail + this.data.id).then(res=>{
+      res.data.textDescription = res.data.textDescription.replace(/\<img/gi, '<img class="richImg" ')
       this.setData({
         data: res.data
       })

pages/service/service-detail.wxml

@@ -10,8 +10,7 @@
 
   <view class="content-bottom">
     <button class="kf-wrapper" open-type="contact">
-      <image class="kf-icon" src="/assets/service/urban-kf.png"/>
-      <view class="kf-text">客服</view>
+      <view class="kf-text">在线客服</view>
     </button>
     <view class="sub" bindtap="orderAction">预约估价</view>
   </view>

pages/service/service-detail.wxss

@@ -60,14 +60,18 @@
 }
 
 .kf-wrapper {
-  width: 128rpx;
+  width: 320rpx;
+  height: 88rpx;
+  background: white;
+  border-radius: 44rpx;
+  border: 1px solid #437CFD;
   display: flex;
   flex-direction: column;
   align-items: center;
   margin: 0;
   margin-top: 22rpx;
-  background: white;
   padding: 0;
+  margin-left: 20rpx;
 }
 
 .kf-wrapper::after {
@@ -80,12 +84,15 @@
 }
 
 .kf-text {
-  height: 36rpx;
-  font-size: 26rpx;
+  height: 88rpx;
   font-family: PingFang-SC-Medium, PingFang-SC;
   font-weight: 500;
   color: #3E3E3E;
-  line-height: 36rpx;
+  line-height: 88rpx;
+  font-size: 32rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #437CFD;
 }
 
 .sub {
@@ -101,4 +108,9 @@
   margin-top: 22rpx;
   margin-right: 20rpx;
   text-align: center;
+}
+
+.richImg {
+  width: 100%;
+  height: auto;
 }
\ No newline at end of file

pages/service/service.wxss

@@ -68,10 +68,10 @@ page {
 
 .cate-left-item {
   height: 126rpx;
-  font-size: 26rpx;
+  font-size: 28rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #8B8B8B;
+  color: #3e3e3e;
   line-height: 126rpx;
   text-align: center;
 }
@@ -113,10 +113,10 @@ page {
 
 .child-name {
   height: 68rpx;
-  font-size: 24rpx;
+  font-size: 26rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #8B8B8B;
+  color: #3e3e3e;
   line-height: 34rpx;
   text-align: center;
   display: flex;

pages/workbench/order-list.js

 const {
-  ApiManagerOrderList, ApiOrderCancel, ApiFinishOrder, ApiOrderNum
+  ApiManagerOrderList, ApiOrderCancel, ApiFinishOrder, ApiOrderNum, ApiSendOrder
 } = require("../../http/api")
 const {
   wxPost, wxGet
@@ -23,7 +23,9 @@ Page({
     roleType: 0,
     orderNum1:0,
     orderNum3:0,
-    orderNum4:0
+    orderNum4:0,
+    price: null,
+    overlayVisible: false
   },
 
   /**
@@ -213,5 +215,36 @@ Page({
         }
       }
     })
+  },
+  sendOrderAction(e){
+    this.id = e.detail.id
+    this.setData({
+      overlayVisible: true
+    })
+  },
+  cancelOverlay() {
+    this.setData({
+      overlayVisible: false
+    })
+  },
+  overlayAction() {
+    if (!this.data.price) {
+      showToast("请输入金额")
+      return
+    }
+    let that = this
+    wx.showLoading({
+      title: '请求中',
+    })
+    wxPost(ApiSendOrder, {
+      "id": this.id,
+      "price": this.data.price
+    }).then(res => {
+      showToast("发送成功")
+      that.setData({
+        overlayVisible: false
+      })
+      that.getData(true)
+    })
   }
 })
\ No newline at end of file

pages/workbench/order-list.wxml

 <!--pages/workbench/order-list.wxml-->
+<import src="../../templates/send-order-template" />
 <view class="header">
   <view class="search">
     <image class="search-icon" src="/assets/main/urban-search.png" />
@@ -43,5 +44,7 @@
 <empty-view imageName="/assets/order/order-empty.png" wx:if="{{list.length == 0}}">
 </empty-view>
 <scroll-view wx:else scroll-y class="sc-list" refresher-enabled="{{true}}" refresher-threshold="{{100}}" refresher-default-style="black" refresher-triggered="{{triggered}}" bindrefresherpulling="onPulling" bindrefresherrefresh="onRefresh" bindrefresherrestore="onRestore" bindrefresherabort="onAbort" bindscrolltolower="bindscrolltolower">
-  <manager-order-item wx:for="{{list}}" wx:key="index" item="{{item}}" roleType="{{roleType}}" bindtap="itemClickAction" data-id="{{item.id}}" bind:dealAction="dealAction"  bind:cancelAction="cancelAction" bind:finishAction="finishAction" bind:dispatchAction="dispatchAction" bind:fixDispatchAction="fixDispatchAction"></manager-order-item>
-</scroll-view>
+  <manager-order-item wx:for="{{list}}" wx:key="index" item="{{item}}" roleType="{{roleType}}" bindtap="itemClickAction" data-id="{{item.id}}" bind:dealAction="dealAction"  bind:cancelAction="cancelAction" bind:finishAction="finishAction" bind:dispatchAction="dispatchAction" bind:fixDispatchAction="fixDispatchAction" bind:sendOrderAction="sendOrderAction"></manager-order-item>
+</scroll-view>
\ No newline at end of file
+
+<template is="send-order" data="{{overlayVisible,price}}"></template>
\ No newline at end of file

pages/workbench/order-list.wxss

 /* pages/workbench/order-list.wxss */
+@import '../../templates/send-order-template.wxss';
 .tab-wrapper {
   width: 750rpx;
   height: 110rpx;

project.private.config.json

@@ -48,6 +48,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/home/home",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

templates/send-order-template.wxml

+<template name="send-order">
+  <view wx:if="{{overlayVisible}}" class="overlay">
+  <view class="overlay-wrapper">
+    <view class="overlay-title">订单发送</view>
+    <view class="overlay-input-wrapper">
+      <input class="overlay-input" placeholder="输入金额" type="digit" model:value="{{price}}"></input>
+      <view class="yuan">元</view>
+    </view>
+    <view class="flex-1"></view>
+    <view class="overlay-line"></view>
+    <view class="overlay-btns">
+      <view class="overlay-btn" bindtap="cancelOverlay">取消</view>
+      <view class="overlay-btn" style="color: #437CFD;" bindtap="overlayAction">确定</view>
+    </view>
+  </view>
+</view>
+  
+</template>
\ No newline at end of file

templates/send-order-template.wxss

+
+
+.overlay {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+  display: flex;
+  justify-content: center;
+}
+
+.overlay-wrapper {
+  width: 600rpx;
+  height: 368rpx;
+  background: #FFFFFF;
+  border-radius: 24rpx;
+  margin-top: 300rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.overlay-title {
+  width: 100%;
+  height: 124rpx;
+  font-size: 32rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #3E3E3E;
+  line-height: 124rpx;
+  text-align: center;
+}
+
+.overlay-input-wrapper {
+  width: 408rpx;
+  height: 92rpx;
+  background: #EEEEEE;
+  border-radius: 8rpx;
+  display: flex;
+  flex-direction: row;
+}
+
+.overlay-input {
+  flex: 1;
+  height: 100%;
+  padding: 0 20rpx;
+}
+
+.yuan {
+  width: 92rpx;
+  height: 92rpx;
+  background: #E2E2E2;
+  border-radius: 0px 8rpx 8rpx 0px;
+  text-align: center;
+  line-height: 92rpx;
+}
+
+.overlay-line {
+  width: 598rpx;
+  height: 1px;
+  background-color: #F1F1F1;
+}
+
+.overlay-btns {
+  width: 100%;
+  height: 96rpx;
+  display: flex;
+  flex-direction: row;
+}
+
+.overlay-btn {
+  flex: 1;
+  height: 96rpx;
+  font-size: 32rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 500;
+  color: #3E3E3E;
+  line-height: 96rpx;
+  text-align: center;
+}
\ No newline at end of file