6.14

packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js

@@ -233,7 +233,6 @@ Page({
             currentDevice:wx.getStorageSync('currentDevice')
         })
         that.getPayList()
-        
         wx.showShareMenu({
             withShareTicket: true,
             menus: ['shareAppMessage', 'shareTimeline']

packages/WaterPurifier/pages/device/deviceList/deviceList.js

@@ -133,7 +133,7 @@ Page({
             }
         }
 
-        util.postUrl(apiArr2.deviceList, param, res => {
+        util.postUrl4(apiArr2.deviceList, param, res => {
             wx.hideLoading()
             let flag = false
             if (res.list && res.list.length == that.data.page_size) {

packages/master/orderDesc/index.js

@@ -284,7 +284,8 @@ Page({
                 });
 
                 util.postUrl(apiArr.getDeviceByCode, {
-                    device_code: res.result
+                    device_code: res.result,
+                    install_id:that.data.id
                 }, res => {
                     console.log(res, '222');
                     that.setData({

packages/partner/pages/WorkOrder/WorkOrder.wxml

@@ -13,7 +13,7 @@
 
             <view class="orderItem_Item" wx:if="{{item.status == 3 || item.status == 4 || item.status == 5}}">
                 <view class="orderItem_Item_tit">设备号</view>
-                <view class="orderItem_Item_con">{{item.device_id}}</view>
+                <view class="orderItem_Item_con">{{item.device_code}}</view>
             </view>
         
             <view class="orderItem_Item">

packages/partner/pages/login/login.js

@@ -11,6 +11,10 @@ Page({
         account: "",
         password: "",
     },
+
+   
+
+
     accountIpt(e) {
         let that = this
         that.setData({
@@ -96,7 +100,11 @@ Page({
 
 
     },
-
+    navigateToAgreement() {
+        wx.navigateTo({
+            url: '/pages/Agreement/Agreement',
+        })
+    },
     getInfo() {
         let that = this
         util.postUrl4(apiArr.loginInfo, {}, res => {

packages/partner/pages/login/login.wxml

@@ -15,6 +15,10 @@
       </view>
     </view> -->
 
+        <view class="agreement">
+            <text>登录即表示您已同意</text>
+            <text class="link" bindtap="navigateToAgreement">《用户服务协议和隐私政策》</text>
+        </view>
 
         <!-- 账号密码登录 -->
         <view>

packages/partner/pages/login/login.wxss

@@ -6,7 +6,16 @@
     position: fixed;
     background-repeat: no-repeat;
   }
+  .agreement {
+    font-size: 24rpx;
+    color: #999;
+    text-align: center;
+    margin-top: 30rpx;
+}
 
+.link {
+    color: #2583ff;
+}
   .login-title {
     margin-top: 655rpx;
   }

packages/partner/pages/newWorkOrder/newWorkOrder.js

@@ -61,6 +61,12 @@ Page({
             show5:true
         })
     },
+    cancel5(){
+        let that= this
+        that.setData({
+            show5:false
+        })
+    },
     changeCustomerName(e) {
         let that = this
         that.setData({

packages/partner/pages/newWorkOrder/newWorkOrder.wxml

@@ -7,7 +7,7 @@
                 套餐
             </view>
             <view class="formItem_con" bind:tap="changeShow1">
-                <input type="text" placeholder="请选择套餐" value="{{package.package_name}}" />
+                <input type="text" placeholder="请选择套餐" disabled value="{{package.package_name}}" />
             </view>
         </view>
 
@@ -17,7 +17,7 @@
                 产品
             </view>
             <view class="formItem_con" bind:tap="changeShow5">
-                <input type="text" placeholder="请选择产品" value="{{product.product_name}}" />
+                <input type="text" placeholder="请选择产品" disabled value="{{product.product_name}}" />
             </view>
         </view>
 
@@ -170,6 +170,6 @@
 </van-popup>
 
 
-<van-popup show="{{ show5 }}" safe-area-inset-bottom lock-scroll bind:close="onClose" round close-on-click-overlay position="bottom">
+<van-popup show="{{ show5 }}" safe-area-inset-bottom lock-scroll bind:close="cancel5" round close-on-click-overlay position="bottom">
     <van-picker show-toolbar bind:cancel="cancel5" bind:confirm="confirmproduct" columns="{{ productList }}" value-key="product_name" />
 </van-popup>

pages/MasterLogin/MasterLogin.js

@@ -13,7 +13,11 @@ Page({
         account: "",
         type:""
     },
-
+    navigateToAgreement() {
+        wx.navigateTo({
+            url: '../Agreement/Agreement',
+        })
+    },
     accountIpt(e) {
         let that = this
         that.setData({

pages/MasterLogin/MasterLogin.wxml

@@ -3,11 +3,15 @@
     <view class="login-title">
         <view class="login-tip" style="font-size: 40rpx; color: #000000;">欢迎来到【人人爱净水】</view>
         <view class="login-tip" style="font-size: 28rpx; color: #555555; margin-top: 30rpx;" wx:if="{{loginType === 'phone'}}">为了更好的体验，申请获取您的公开信息</view>
+        <view class="login-tip" style="font-size: 28rpx; color: #555555; margin-top: 14rpx;">（头像、昵称等）</view>
 
+        <view class="agreement">
+            <text>登录即表示您已同意</text>
+            <text class="link" bindtap="navigateToAgreement">《用户服务协议和隐私政策》</text>
+        </view>
 
         <!-- 手机登录 -->
         <view>
-            <view class="login-tip" style="font-size: 28rpx; color: #555555; margin-top: 14rpx;">（头像、昵称等）</view>
             <view class="login-button">
                 <button class="login-btn" open-type="getPhoneNumber" bindtap="headerLoginClick" bindgetphonenumber="getPhoneNumber">
                     授权登录

pages/MasterLogin/MasterLogin.wxss

@@ -7,6 +7,17 @@
     background-repeat: no-repeat;
   }
   
+.agreement {
+    font-size: 24rpx;
+    color: #999;
+    text-align: center;
+    margin-top: 30rpx;
+}
+
+.link {
+    color: #2583ff;
+}
+
   .login-title {
     margin-top: 655rpx;
   }

pages/chooseEntrance/chooseEntrance.js

@@ -18,10 +18,57 @@ Page({
     navigateToClient() {
 
         if (wx.getStorageSync('ctoken') && wx.getStorageSync('loginMaster') == '1') {
+
+            wx.getSetting({
+                withSubscriptions: true,
+                success: (res) => {
+                    if (res.subscriptionsSetting && res.subscriptionsSetting.mainSwitch) {
+                        const itemSettings = res.subscriptionsSetting.itemSettings || {};
+                        const tmplMap = {
+                            '5yPg-WOoP9-9ZU1fHjC4zg1KNaPWb76K87JzzKb58f0': '工单完成通知',
+                            'qLYGETdlX5pR8WvTs8v4g4zlBOhA04z46KS_Q_yesr4': '工单派工通知',
+                            '5yPg-WOoP9-9ZU1fHjC4zg1KNaPWb76K87JzzKb58f0': '订单付款通知'
+                        };
+
+                        const unsubscribedTmplIds = [];
+                        Object.keys(tmplMap).forEach(tmplId => {
+                            if (itemSettings[tmplId] !== 'accept') {
+                                unsubscribedTmplIds.push(tmplId);
+                            }
+                        });
+
+                        if (unsubscribedTmplIds.length > 0) {
+                            wx.requestSubscribeMessage({
+                                tmplIds: unsubscribedTmplIds,
+                                success: (res) => {
                                     wx.navigateTo({
                                         url: '/pages/water_filter/water_filter',
                                     })
+                                },
+                                fail: (err) => {
+                                    wx.navigateTo({
+                                        url: '/pages/water_filter/water_filter',
+                                    })
+                                }
+                            });
                         } else {
+                            wx.navigateTo({
+                                url: '/pages/water_filter/water_filter',
+                            })
+                        }
+                    }
+                },
+                fail: () => {
+                    wx.navigateTo({
+                        url: '/pages/water_filter/water_filter',
+                    })
+                }
+            });
+
+          
+        } else {
+
+            
             wx.navigateTo({
                 url: '/pages/login/login',
             })
@@ -107,7 +154,7 @@ Page({
         if (accountInfo.miniProgram.version) {
             version = accountInfo.miniProgram.version
         } else {
-            version = '1.0.19'
+            version = '1.0.22'
         }
 
         wx.setStorageSync('version', version)

pages/deposit/deposit.js

@@ -391,19 +391,31 @@ Page({
                                     success: (res) => {
                                         console.log('订阅成功', res);
                                         that.getUserInfo();
+                                        // wx.reLaunch({
+                                        //     url: '/pages/water_filter/water_filter',
+                                        // })
                                     },
                                     fail: (err) => {
                                         console.error('订阅失败', err);
                                         that.getUserInfo();
+                                        // wx.reLaunch({
+                                        //     url: '/pages/water_filter/water_filter',
+                                        // })
                                     }
                                 });
                             } else {
                                 that.getUserInfo();
+                                // wx.reLaunch({
+                                //     url: '/pages/water_filter/water_filter',
+                                // })
                             }
                         }
                     },
                     fail: () => {
                         that.getUserInfo();
+                        // wx.reLaunch({
+                        //     url: '/pages/water_filter/water_filter',
+                        // })
                     }
                 });
 
@@ -426,10 +438,12 @@ Page({
             wx.setStorageSync('dealer_id', ress.dealer_id);
             wx.setStorageSync('is_dev', ress.is_dev);
 
-            // if (ress.is_dev == 2) {
+            wx.reLaunch({
-            wx.navigateTo({
+                url: '/pages/water_filter/water_filter',
-                url: '/pages/newOrderList/newOrderList',
             })
+
+            // if (ress.is_dev == 2) {
+
             // } else if (ress.is_dev == 3) {
             //     wx.navigateTo({
             //         url: '/pages/water_filter/water_filter',

pages/newOrderList/newOrderList.js

@@ -36,7 +36,6 @@ Page({
         wx.navigateTo({
           url: `../newOrderListDesc/index?id=${e.currentTarget.dataset.id}`,
         })
-
     },
     addWorkOrder() {
         wx.navigateTo({

pages/newOrderList/newOrderList.wxml

@@ -1,11 +1,5 @@
 <view class="upkeep">
 
-<!-- <view class="upkeep_select">
-    <view class="ipt">
-        <input value="{{searchText}}" bindinput="ipt1" type="text" placeholder="工单号/客户名称/客户手机" placeholder-style="color: #999999;font-size: 24rpx;" />
-        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/dervice/deriveSearch.png?1" mode="widthFix" bind:tap="search" />
-    </view>
-</view> -->
 
 <view class="orderList" wx:if="{{deviceList.length != 0}}">
     <view class="orderItem" wx:for="{{deviceList}}" wx:key="index" bind:tap="desc" data-id="{{item.install_id}}">

pages/water_filter/water_filter.js

@@ -13,6 +13,8 @@ Page({
      * 页面的初始数据
      */
     data: {
+
+        newOrderDesc: {},
         s: app.system.statusBarHeight, // 状态栏高度
         n: (app.menu.top - app.system.statusBarHeight) * 2 + app.menu.height, // 导航栏高度
         t: app.menu.top, // 胶囊局顶部距离
@@ -103,6 +105,9 @@ Page({
             },
         ],
         foot_width: '50%',
+
+        newOrderList: [],
+        newOrderInfo: "",
     },
     back() {
         wx.redirectTo({
@@ -147,7 +152,6 @@ Page({
         })
     },
 
-
     getPermission() {
         let that = this
         wx.requestSubscribeMessage({
@@ -233,7 +237,7 @@ Page({
         }
 
         wx.showLoading({
-            title: '登录中...',
+            title: '操作中...',
             mask: true
         })
 
@@ -249,7 +253,7 @@ Page({
                         icon: "none"
                     })
                     that.setData({
-                        "currentDevice.sevice_status": 0
+                        "currentDevice.sevice_status": 2
                     })
                     console.log('关机');
                 } else if (res.data.params.sevice_status.value == '10') {
@@ -266,6 +270,61 @@ Page({
         })
     },
 
+    getNewOrderList() {
+        let that = this
+        wx.showLoading({
+            title: '加载中...',
+            mask: true,
+        })
+        //设置加载状态
+        util.postUrl(apiArr.userNewOrderList, {
+            page_size: that.data.page_size,
+            page_num: that.data.page_num,
+        }, res => {
+            wx.hideLoading()
+            if (res.rows) {
+                let flag = false
+                that.setData({
+                    newOrderList: that.data.newOrderList.concat(res.rows || []),
+                })
+                if(res.rows.length){
+                    that.getNewOrderInfo(res.rows[0].install_id)
+                }
+            }
+        })
+    },
+
+    call(){
+        let that= this
+        wx.makePhoneCall({
+          phoneNumber: that.data.newOrderDesc.cus_service_phone,
+        })
+    },
+
+    getNewOrderInfo(e) {
+        let that = this
+        util.postUrl(apiArr.newOrderDesc, { install_id: Number(e) }, res => {
+            res.product_icon2 = util.img_url + res.product_icon
+            res.qrcode2 = util.img_url + res.qrcode
+            that.setData({
+                newOrderDesc: res,
+            })
+            if (res.status == 3) {
+                let imgList2 = res.install_imgs.split(',')
+                let imgList = []
+                imgList2.forEach((item, index) => {
+                    imgList.push(util.img_url + item)
+                })
+                that.setData({
+                    msg: res.install_desc,
+                    imgList2,
+                    imgList,
+                    dis1: true
+                })
+            }
+        })
+    },
+
     getUserInfo() {
         wx.showLoading({
             title: '加载中...',
@@ -285,6 +344,11 @@ Page({
             that.setData({
                 is_dev: wx.getStorageSync('is_dev')
             })
+
+            if (ress.is_dev == 2) {
+                that.getNewOrderList()
+            }
+
         })
     },
 
@@ -446,6 +510,10 @@ Page({
     jumps(e) {
         console.log(e);
         if (e.currentTarget.dataset.idx == '1') {
+            wx.redirectTo({
+                url: e.currentTarget.dataset.url,
+            })
+            return
             wx.getSetting({
                 withSubscriptions: true,
                 success: (res) => {
@@ -823,11 +891,11 @@ Page({
         })
     },
 
-    newOrder() {
+    // newOrder() {
-        wx.navigateTo({
+    //     wx.navigateTo({
-            url: '/pages/newOrderList/newOrderList',
+    //         url: '/pages/newOrderList/newOrderList',
-        })
+    //     })
-    },
+    // },
 
     //查询设备实时信息
     getDeriveInfo() {

pages/water_filter/water_filter.wxml

@@ -107,8 +107,8 @@
 
                     <view class="device-state" wx:if="{{login}}">
 
-                        <image wx:if="{{currentDevice.sevice_status != 1}}" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/Group_405.png?v1" mode="" class="switch-icon" />
+                        <image wx:if="{{currentDevice.sevice_status == '2'}}" bind:tap="openOff" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/Group_405.png?v1" mode="" class="switch-icon" />
-                        <image wx:if="{{currentDevice.sevice_status == 1}}" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/openBtn.png" mode="" class="switch-icon" />
+                        <image wx:if="{{currentDevice.sevice_status == '1'}}" bind:tap="openOff" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/openBtn.png" mode="" class="switch-icon" />
 
                         <text class="switch-text text-color text-size" bind:tap="openOff" wx:if="{{currentDevice.sevice_status == '1'}}">开机</text>
                         <text class="switch-text text-color text-size" bind:tap="openOff" wx:if="{{currentDevice.sevice_status == '2'}}">关机</text>
@@ -118,7 +118,7 @@
 
 
                         <image wx:if="{{currentDevice.network_status != '1'}}" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/mdicon3.png" mode="" class="wifi-icon" />
-                        <image wx:if="{{currentDevice.network_status == '1'}}" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/mdicon4.png" mode="" class="wifi-icon" />
+                        <image wx:if="{{currentDevice.network_status == 1}}" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/mdicon4.png" mode="" class="wifi-icon" />
                         <text class="wifi-text text-color text-size">{{currentDevice.network_status == '1'?'在线':'离线'}}</text>
 
                     </view>
@@ -252,9 +252,79 @@
         添加设备
     </view>
 
-    <view wx:if="{{is_dev == 2 }}" class="btnDevice" bind:tap="newOrder">
+    <view wx:if="{{is_dev == 2 }}">
-        查看进度
+        <view class="section">
+            <view class="section-title">工单信息</view>
+            <view class="info-item">
+                <text class="label">产品名称：</text>
+                <text class="value">{{newOrderDesc.product_name || '暂无数据'}}</text>
             </view>
+
+            <view class="info-item">
+                <text class="label">约定时间：</text>
+                <text class="value">{{newOrderDesc.appointment_time || '暂无数据'}}</text>
+            </view>
+
+            <view class="info-item">
+                <text class="label">客户姓名：</text>
+                <text class="value">{{newOrderDesc.customer_name || '暂无数据'}}</text>
+            </view>
+
+            <view class="info-item">
+                <text class="label">客户电话：</text>
+                <text class="value">{{newOrderDesc.customer_phone || '暂无数据'}}</text>
+            </view>
+
+            <view class="info-item">
+                <text class="label">客户地址：</text>
+                <text class="value">{{newOrderDesc.address || '暂无数据'}}</text>
+            </view>
+
+            <view class="info-item" wx:if="{{newOrderDesc.repairman_name}}">
+                <text class="label">维修师傅：</text>
+                <text class="value">{{newOrderDesc.repairman_name}}</text>
+            </view>
+
+            <view class="info-item" wx:if="{{newOrderDesc.repairman_phone}}">
+                <text class="label">维修师傅电话：</text>
+                <text class="value">{{newOrderDesc.repairman_phone}}</text>
+            </view>
+
+            <view class="info-item">
+                <text class="label">客户地址：</text>
+                <text class="value">{{newOrderDesc.address || '暂无数据'}}</text>
+            </view>
+
+            <view class="info-item">
+                <text class="label">订单状态：</text>
+                <text class="value " wx:if="{{newOrderDesc.status == '1'}}">待分配</text>
+                <text class="value " wx:if="{{newOrderDesc.status == '2'}}">安装中</text>
+                <text class="value " wx:if="{{newOrderDesc.status == '3'}}">待激活</text>
+                <text class="value " wx:if="{{newOrderDesc.status == '4'}}">已安装</text>
+                <text class="value " wx:if="{{newOrderDesc.status == '5'}}">忽视</text>
+            </view>
+
+            <view class="info-item">
+                <text class="label">客服电话：</text>
+                <view class="value" bind:tap="call">
+                    {{newOrderDesc.cus_service_phone}}
+                    <van-icon name="phone-o" color="#8bc34a" />
+                </view>
+
+            </view>
+
+
+            <view class="info-item" wx:if="{{newOrderDesc.qrcode}}">
+                <text class="label">客服二维码：</text>
+            </view>
+
+            <view class="product-image" wx:if="{{newOrderDesc.qrcode}}">
+                <image src="{{newOrderDesc.qrcode2}}" mode="aspectFit" />
+            </view>
+
+        </view>
+    </view>
+
 </view>
 
 

pages/water_filter/water_filter.wxss

@@ -629,3 +629,112 @@
     font-size: 36rpx;
     color: #FFFFFF;
 }
+
+
+
+
+.section {
+    margin-top: 40rpx;
+    width: 100%;
+    margin-bottom: 40rpx;
+    padding: 20rpx;
+    background: #fff;
+    border-radius: 8rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    margin-bottom: 20rpx;
+    color: #000;
+}
+
+.info-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 16rpx;
+    white-space: nowrap;
+}
+
+.label {
+    color: #666;
+    font-size: 28rpx;
+    width: 210rpx;
+}
+
+.value {
+    color: #333;
+    font-size: 28rpx;
+    flex: 1;
+}
+
+.product-image {
+    margin: 32rpx 0;
+    text-align: center;
+    box-sizing: border-box;
+    width: 300rpx;
+    height: 300rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.product-image image {
+    width: 280rpx;
+    height: 280rpx;
+    border-radius: 16rpx;
+    box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+}
+
+.complete-btn-container {
+    position: fixed;
+    bottom: 32rpx;
+    left: 32rpx;
+    right: 32rpx;
+    display: flex;
+    justify-content: space-between;
+}
+
+.complete-btn {
+    width: 48%;
+    height: 80rpx;
+    line-height: 80rpx;
+    background: #2583FF;
+    color: #fff;
+    border-radius: 40rpx;
+    font-size: 32rpx;
+}
+
+.cancel-btn {
+    background: #999;
+}
+
+
+.installation-images {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+}
+
+.installation-image {
+    width: 210rpx;
+    height: 210rpx;
+    border-radius: 8rpx;
+}
+
+
+.image-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+    /* 图片间距 */
+    position: relative;
+}
+
+.image-item {
+    width: calc((100% - 32rpx) / 3);
+    /* 每行显示3张图片，减去间距 */
+    height: 210rpx;
+    border-radius: 8rpx;
+}

project.private.config.json

@@ -2,6 +2,20 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "/packages/WaterPurifier/pages/Addfriend/Addfriend",
+          "pathName": "/packages/WaterPurifier/pages/Addfriend/Addfriend",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "新增工单详情",
+          "pathName": "pages/newOrderListDesc/index",
+          "query": "id=5",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "用户新装工单列表",
           "pathName": "pages/newOrderList/newOrderList",