114

app.js

@@ -23,7 +23,7 @@ App({
     userInfo: null,
     btnInfo: null,
     status: ['可下单', '服务中', '已满柜', '暂停服务'],
-    baseAppUrl: projectMode == 2 ? 'https://hx.xishuashua.art/' : (projectMode == 1 ? 'https://wash.nanodreamtech.com/' : 'https://wash.nanodreamtech.com/'),
+    baseAppUrl: projectMode == 2 ? 'https://hx.xishuashua.art/' : (projectMode == 1 ? 'https://hx.xishuashua.art/' : 'https://wash.nanodreamtech.com/'),
     location: "",
     islocation: true
   },

pages/logistics/index.js

@@ -180,6 +180,12 @@ Page({
         }
 
 
-    }
+    },
+    location(e){
+        wx.openLocation({
+            latitude: Number(e.currentTarget.dataset.lat),
+            longitude:Number(e.currentTarget.dataset.lng)
+        });
+      }
 
 })

pages/logistics/index.wxml

@@ -106,7 +106,7 @@
           </view>
         </view>
         <view class="section22-1">
-          <view class="groupalert1-1">
+          <view class="groupalert1-1" bindtap="location" data-lat="{{worke.lat}}" data-lng="{{worke.lng}}">
             <text lines="1" class="info30-2">导航</text>
             <text lines="1" class="txt40-2">{{worke.distance}}KM</text>
           </view>

pages/take/index.js

@@ -14,8 +14,6 @@ Page({
      */
     onLoad: function (options) {
 
-
-
     },
 
     /**

pages/take/lattice.js

@@ -16,6 +16,7 @@ Page({
     taskdetail: "",
     orderSn: '',
     smallPhone: '',
+    deviceId:"",
     status: '',//当前选中的状态
     operateStatus: ''//操作后的状态
   },
@@ -24,10 +25,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    deviceId = 123
-
-
-
+    deviceId = options.deviceId
+      this.setData({deviceId:deviceId})
   },
   onPullDownRefresh: function () {
     this.gettaskList();
@@ -85,8 +84,9 @@ Page({
   },
   gettaskList() {
     var that = this;
+    console.log(that.data.deviceId);
     app.api.useApi(app.globalData.baseAppUrl + "api/admin/TakeDevices", {
-      device_no: deviceId
+      device_no: that.data.deviceId
     }, "get").then(function (res) {
       console.log(res);
       if (res.code != 200) {
@@ -266,6 +266,10 @@ Page({
         that.setData({
           operateStatus: res.message.data.status
         })
+        wx.showToast({ title: res.message.msg, icon: 'none' })
+        this.setData({
+          show: !this.data.show
+        })
       } else
         wx.showToast({ title: res.message.msg, icon: 'none' })
 

pages/take/lattice.wxml

@@ -3,7 +3,7 @@
 
     <view class="main3">
       <view class="mod1">
-        <text lines="1" decode="true" class="txt1">{{workeinfo.title}}&nbsp;NO.18</text>
+        <text lines="1" decode="true" class="txt1">{{workeinfo.title}}&nbsp;</text>
         <view class="main4"></view>
         <text lines="1" class="word3" style="{{workeinfo.status?'':'coloe:#ccc'}}">{{workeinfo.status?"在线":'离线'}}</text>
       </view>

project.config.json

@@ -1,87 +1,96 @@
 {
-    "description": "项目配置文件",
-    "packOptions": {
-        "ignore": [
-            {
-                "type": "file",
-                "value": ".eslintrc.js"
-            }
-        ]
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": [
+      {
+        "type": "file",
+        "value": ".eslintrc.js"
+      }
+    ]
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": true,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
-    "setting": {
-        "urlCheck": false,
-        "es6": true,
-        "enhance": true,
-        "postcss": true,
-        "preloadBackgroundData": false,
-        "minified": true,
-        "newFeature": false,
-        "coverView": true,
-        "nodeModules": true,
-        "autoAudits": false,
-        "showShadowRootInWxmlPanel": true,
-        "scopeDataCheck": false,
-        "uglifyFileName": false,
-        "checkInvalidKey": true,
-        "checkSiteMap": true,
-        "uploadWithSourceMap": true,
-        "compileHotReLoad": false,
-        "lazyloadPlaceholderEnable": false,
-        "useMultiFrameRuntime": true,
-        "useApiHook": true,
-        "useApiHostProcess": true,
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        },
-        "enableEngineNative": false,
-        "useIsolateContext": false,
-        "userConfirmedBundleSwitch": false,
-        "packNpmManually": false,
-        "packNpmRelationList": [
-            {
-                "packageJsonPath": "./package.json",
-                "miniprogramNpmDistDir": "./"
-            }
-        ],
-        "minifyWXSS": true,
-        "disableUseStrict": false,
-        "minifyWXML": true,
-        "showES6CompileOption": false,
-        "useCompilerPlugins": false
+    "useIsolateContext": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [
+      {
+        "packageJsonPath": "./package.json",
+        "miniprogramNpmDistDir": "./"
+      }
+    ],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.22.0",
+  "appid": "wx96efd334b6da6e38",
+  "projectname": "%E6%B5%B7%E6%98%9F%E5%88%86%E6%8B%A3%E7%AB%AF",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "staticServerOptions": {
+    "baseURL": "",
+    "servePath": ""
+  },
+  "isGameTourist": false,
+  "condition": {
+    "search": {
+      "list": []
     },
+<<<<<<< HEAD
     "compileType": "miniprogram",
     "libVersion": "2.22.0",
     "appid": "wx3474318f187cd0f2",
     "projectname": "%E6%B5%B7%E6%98%9F%E5%88%86%E6%8B%A3%E7%AB%AF",
     "debugOptions": {
         "hidedInDevtools": []
+=======
+    "conversation": {
+      "list": []
+>>>>>>> bd27695b9b7182c49e8ceb2f33c88a17ac68d21b
     },
-    "scripts": {},
-    "staticServerOptions": {
-        "baseURL": "",
-        "servePath": ""
+    "game": {
+      "list": []
     },
-    "isGameTourist": false,
-    "condition": {
-        "search": {
-            "list": []
-        },
-        "conversation": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "plugin": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
-        },
-        "miniprogram": {
-            "list": []
-        }
+    "plugin": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
     }
+  }
 }