diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file

diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index db1c90a..163c743 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,8 @@
     // this.globalData = {}
   },
   globalData: {
-    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
-    httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
-    // httpsUrl: "https://gas.task.smartlog.work/", // 线上
+    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
     nickName:"",

diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index db1c90a..163c743 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,8 @@
     // this.globalData = {}
   },
   globalData: {
-    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
-    httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
-    // httpsUrl: "https://gas.task.smartlog.work/", // 线上
+    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
     nickName:"",
diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json
index f9502d4..48cf461 100644
--- a/miniprogram/package-lock.json
+++ b/miniprogram/package-lock.json
@@ -1,10 +1,18 @@
 {
   "name": "package.json",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@vant/weapp": {
+  "packages": {
+    "": {
+      "name": "package.json",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@vant/weapp": "^1.3.1"
+      }
+    },
+    "node_modules/@vant/weapp": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.3.1.tgz",
       "integrity": "sha512-b4Kr1TUVRtoCKRphRvGYoQIKoSi2QBt3v4VrD6pwKOav3U3AVxKKLcqdCRkVMyTGsZrnwD/5se/HXcXA4ra9dg=="

diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index db1c90a..163c743 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,8 @@
     // this.globalData = {}
   },
   globalData: {
-    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
-    httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
-    // httpsUrl: "https://gas.task.smartlog.work/", // 线上
+    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
     nickName:"",
diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json
index f9502d4..48cf461 100644
--- a/miniprogram/package-lock.json
+++ b/miniprogram/package-lock.json
@@ -1,10 +1,18 @@
 {
   "name": "package.json",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@vant/weapp": {
+  "packages": {
+    "": {
+      "name": "package.json",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@vant/weapp": "^1.3.1"
+      }
+    },
+    "node_modules/@vant/weapp": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.3.1.tgz",
       "integrity": "sha512-b4Kr1TUVRtoCKRphRvGYoQIKoSi2QBt3v4VrD6pwKOav3U3AVxKKLcqdCRkVMyTGsZrnwD/5se/HXcXA4ra9dg=="
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 86fd531..339d469 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -3,6 +3,14 @@
 var QQMapWX = require('../../libs/qqmap-wx-jssdk.js');
 var qqmapsdk;
 var app = getApp()
+const installTypeMap = {
+    '1': '初次安装',
+    '2': '初次拆走',
+    '3': '二次安装',
+    '4': '二次拆走',
+    '5': '正在维护',
+    '6': '其他',
+}
 Page({
 
   /**
@@ -59,7 +67,6 @@
       factory: "",
       workmsg: "",
       position: "",
-      description: "",
       longitude: "",
       latitude: "",
       longitude84: "",
@@ -73,6 +80,7 @@
       photopath2: '',
       photopath3: '',
       installType: '1', // 设备安装情况
+      description: "初次安装", // 备注
     },
     fileList: [],
     listQuery: {
@@ -165,19 +173,19 @@
         'projectName': app.globalData.selectProjectName,
     })
     console.log('ppp', that.data.form.project);
-    //初始化表单内容为上次填写值
-    var cacheForms = wx.getStorageSync('cacheList')
-    if (cacheForms) {
-      cacheForms.photopath1=''
-      cacheForms.photopath2=''
-      cacheForms.photopath3=''
-      that.data.fileList=[]
-      that.setData({
-        form: cacheForms,
-        devcode: cacheForms.devcode,
-      })
-    }
-    var form = that.data.form
+    //=========初始化表单内容为上次填写值==========
+    // var cacheForms = wx.getStorageSync('cacheList')
+    // if (cacheForms) {
+    //   cacheForms.photopath1=''
+    //   cacheForms.photopath2=''
+    //   cacheForms.photopath3=''
+    //   that.data.fileList=[]
+    //   that.setData({
+    //     form: cacheForms,
+    //     devcode: cacheForms.devcode,
+    //   })
+    // }
+    // var form = that.data.form
     //默认安装经纬度为当前位置(gcj02)
     wx.getLocation({
       type: "gcj02",
@@ -265,7 +273,6 @@
 
 
     //获取项目下拉列表
-
     wx.request({
       method: "POST",
       url: app.globalData.httpsUrl + "project/getProject",    
@@ -329,6 +336,12 @@
 
     // 粘贴经纬度
     this.paste()
+
+    // 处理备注的默认
+    var description = 'form.description';
+    that.setData({
+        [description]: installTypeMap[that.data.form.installType]
+    })
   },
 
 
@@ -368,6 +381,18 @@
   onPullDownRefresh: function () {
 
   },
+
+  //   监听页面滚动
+  onPageScroll(e) {
+    console.log('监听页面滚动');
+    var that = this
+    console.log(that.selectComponent('#selectPersonDropdown'));
+    // that.selectComponent('#selectPersonDropdown').triggerEvent(false)
+},
+
+toggle() {
+
+},
   //   点击检索
   searchWellCode() {
     if(!this.data.form.wellcode) {
@@ -768,8 +793,10 @@
   selectInstallType(value) {
     var that = this;
     var installType = 'form.installType';
+    var description = 'form.description';
     that.setData({
-      [installType]: value.detail
+      [installType]: value.detail,
+      [description]: installTypeMap[value.detail]
     })
   },
 

diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index db1c90a..163c743 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,8 @@
     // this.globalData = {}
   },
   globalData: {
-    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
-    httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
-    // httpsUrl: "https://gas.task.smartlog.work/", // 线上
+    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
     nickName:"",
diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json
index f9502d4..48cf461 100644
--- a/miniprogram/package-lock.json
+++ b/miniprogram/package-lock.json
@@ -1,10 +1,18 @@
 {
   "name": "package.json",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@vant/weapp": {
+  "packages": {
+    "": {
+      "name": "package.json",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@vant/weapp": "^1.3.1"
+      }
+    },
+    "node_modules/@vant/weapp": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.3.1.tgz",
       "integrity": "sha512-b4Kr1TUVRtoCKRphRvGYoQIKoSi2QBt3v4VrD6pwKOav3U3AVxKKLcqdCRkVMyTGsZrnwD/5se/HXcXA4ra9dg=="
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 86fd531..339d469 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -3,6 +3,14 @@
 var QQMapWX = require('../../libs/qqmap-wx-jssdk.js');
 var qqmapsdk;
 var app = getApp()
+const installTypeMap = {
+    '1': '初次安装',
+    '2': '初次拆走',
+    '3': '二次安装',
+    '4': '二次拆走',
+    '5': '正在维护',
+    '6': '其他',
+}
 Page({
 
   /**
@@ -59,7 +67,6 @@
       factory: "",
       workmsg: "",
       position: "",
-      description: "",
       longitude: "",
       latitude: "",
       longitude84: "",
@@ -73,6 +80,7 @@
       photopath2: '',
       photopath3: '',
       installType: '1', // 设备安装情况
+      description: "初次安装", // 备注
     },
     fileList: [],
     listQuery: {
@@ -165,19 +173,19 @@
         'projectName': app.globalData.selectProjectName,
     })
     console.log('ppp', that.data.form.project);
-    //初始化表单内容为上次填写值
-    var cacheForms = wx.getStorageSync('cacheList')
-    if (cacheForms) {
-      cacheForms.photopath1=''
-      cacheForms.photopath2=''
-      cacheForms.photopath3=''
-      that.data.fileList=[]
-      that.setData({
-        form: cacheForms,
-        devcode: cacheForms.devcode,
-      })
-    }
-    var form = that.data.form
+    //=========初始化表单内容为上次填写值==========
+    // var cacheForms = wx.getStorageSync('cacheList')
+    // if (cacheForms) {
+    //   cacheForms.photopath1=''
+    //   cacheForms.photopath2=''
+    //   cacheForms.photopath3=''
+    //   that.data.fileList=[]
+    //   that.setData({
+    //     form: cacheForms,
+    //     devcode: cacheForms.devcode,
+    //   })
+    // }
+    // var form = that.data.form
     //默认安装经纬度为当前位置(gcj02)
     wx.getLocation({
       type: "gcj02",
@@ -265,7 +273,6 @@
 
 
     //获取项目下拉列表
-
     wx.request({
       method: "POST",
       url: app.globalData.httpsUrl + "project/getProject",    
@@ -329,6 +336,12 @@
 
     // 粘贴经纬度
     this.paste()
+
+    // 处理备注的默认
+    var description = 'form.description';
+    that.setData({
+        [description]: installTypeMap[that.data.form.installType]
+    })
   },
 
 
@@ -368,6 +381,18 @@
   onPullDownRefresh: function () {
 
   },
+
+  //   监听页面滚动
+  onPageScroll(e) {
+    console.log('监听页面滚动');
+    var that = this
+    console.log(that.selectComponent('#selectPersonDropdown'));
+    // that.selectComponent('#selectPersonDropdown').triggerEvent(false)
+},
+
+toggle() {
+
+},
   //   点击检索
   searchWellCode() {
     if(!this.data.form.wellcode) {
@@ -768,8 +793,10 @@
   selectInstallType(value) {
     var that = this;
     var installType = 'form.installType';
+    var description = 'form.description';
     that.setData({
-      [installType]: value.detail
+      [installType]: value.detail,
+      [description]: installTypeMap[value.detail]
     })
   },
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 871ea29..037b327 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -69,8 +69,8 @@
 			<van-field disabled label="安装人员" border="{{ true }}" required/>
 		</van-col>
 		<van-col span="12">
-			<van-dropdown-menu active-color="#ffcf00">
-				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" />
+			<van-dropdown-menu active-color="#ffcf00" >
+				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" id="selectPersonDropdown"/>
 			</van-dropdown-menu>
 		</van-col>
 	</van-row>
@@ -96,7 +96,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" multiple file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>

diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index db1c90a..163c743 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,8 @@
     // this.globalData = {}
   },
   globalData: {
-    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
-    httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
-    // httpsUrl: "https://gas.task.smartlog.work/", // 线上
+    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
     nickName:"",
diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json
index f9502d4..48cf461 100644
--- a/miniprogram/package-lock.json
+++ b/miniprogram/package-lock.json
@@ -1,10 +1,18 @@
 {
   "name": "package.json",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@vant/weapp": {
+  "packages": {
+    "": {
+      "name": "package.json",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@vant/weapp": "^1.3.1"
+      }
+    },
+    "node_modules/@vant/weapp": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.3.1.tgz",
       "integrity": "sha512-b4Kr1TUVRtoCKRphRvGYoQIKoSi2QBt3v4VrD6pwKOav3U3AVxKKLcqdCRkVMyTGsZrnwD/5se/HXcXA4ra9dg=="
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 86fd531..339d469 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -3,6 +3,14 @@
 var QQMapWX = require('../../libs/qqmap-wx-jssdk.js');
 var qqmapsdk;
 var app = getApp()
+const installTypeMap = {
+    '1': '初次安装',
+    '2': '初次拆走',
+    '3': '二次安装',
+    '4': '二次拆走',
+    '5': '正在维护',
+    '6': '其他',
+}
 Page({
 
   /**
@@ -59,7 +67,6 @@
       factory: "",
       workmsg: "",
       position: "",
-      description: "",
       longitude: "",
       latitude: "",
       longitude84: "",
@@ -73,6 +80,7 @@
       photopath2: '',
       photopath3: '',
       installType: '1', // 设备安装情况
+      description: "初次安装", // 备注
     },
     fileList: [],
     listQuery: {
@@ -165,19 +173,19 @@
         'projectName': app.globalData.selectProjectName,
     })
     console.log('ppp', that.data.form.project);
-    //初始化表单内容为上次填写值
-    var cacheForms = wx.getStorageSync('cacheList')
-    if (cacheForms) {
-      cacheForms.photopath1=''
-      cacheForms.photopath2=''
-      cacheForms.photopath3=''
-      that.data.fileList=[]
-      that.setData({
-        form: cacheForms,
-        devcode: cacheForms.devcode,
-      })
-    }
-    var form = that.data.form
+    //=========初始化表单内容为上次填写值==========
+    // var cacheForms = wx.getStorageSync('cacheList')
+    // if (cacheForms) {
+    //   cacheForms.photopath1=''
+    //   cacheForms.photopath2=''
+    //   cacheForms.photopath3=''
+    //   that.data.fileList=[]
+    //   that.setData({
+    //     form: cacheForms,
+    //     devcode: cacheForms.devcode,
+    //   })
+    // }
+    // var form = that.data.form
     //默认安装经纬度为当前位置(gcj02)
     wx.getLocation({
       type: "gcj02",
@@ -265,7 +273,6 @@
 
 
     //获取项目下拉列表
-
     wx.request({
       method: "POST",
       url: app.globalData.httpsUrl + "project/getProject",    
@@ -329,6 +336,12 @@
 
     // 粘贴经纬度
     this.paste()
+
+    // 处理备注的默认
+    var description = 'form.description';
+    that.setData({
+        [description]: installTypeMap[that.data.form.installType]
+    })
   },
 
 
@@ -368,6 +381,18 @@
   onPullDownRefresh: function () {
 
   },
+
+  //   监听页面滚动
+  onPageScroll(e) {
+    console.log('监听页面滚动');
+    var that = this
+    console.log(that.selectComponent('#selectPersonDropdown'));
+    // that.selectComponent('#selectPersonDropdown').triggerEvent(false)
+},
+
+toggle() {
+
+},
   //   点击检索
   searchWellCode() {
     if(!this.data.form.wellcode) {
@@ -768,8 +793,10 @@
   selectInstallType(value) {
     var that = this;
     var installType = 'form.installType';
+    var description = 'form.description';
     that.setData({
-      [installType]: value.detail
+      [installType]: value.detail,
+      [description]: installTypeMap[value.detail]
     })
   },
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 871ea29..037b327 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -69,8 +69,8 @@
 			<van-field disabled label="安装人员" border="{{ true }}" required/>
 		</van-col>
 		<van-col span="12">
-			<van-dropdown-menu active-color="#ffcf00">
-				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" />
+			<van-dropdown-menu active-color="#ffcf00" >
+				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" id="selectPersonDropdown"/>
 			</van-dropdown-menu>
 		</van-col>
 	</van-row>
@@ -96,7 +96,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" multiple file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>
diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js
index 3d45d89..5535c2f 100644
--- a/miniprogram/pages/applog/applog.js
+++ b/miniprogram/pages/applog/applog.js
@@ -92,7 +92,8 @@
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+      console.log('触发下拉刷新');
+    this.initPages(true)
   },
 
   /**
@@ -261,8 +262,11 @@
     that.setData({
       show: false
     })
-   
-    var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1
+      if(needClear) {
+     var offsetValue = 1
+   } else {
+     var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1
+   }
 
     wx.request({
       method: "POST",
@@ -313,6 +317,7 @@
             total: that.data.deviceloglist.length
           })
         }
+        wx.stopPullDownRefresh() // 下拉刷新回弹
       }
     })
 

diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index db1c90a..163c743 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,8 @@
     // this.globalData = {}
   },
   globalData: {
-    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
-    httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
-    // httpsUrl: "https://gas.task.smartlog.work/", // 线上
+    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
     nickName:"",
diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json
index f9502d4..48cf461 100644
--- a/miniprogram/package-lock.json
+++ b/miniprogram/package-lock.json
@@ -1,10 +1,18 @@
 {
   "name": "package.json",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@vant/weapp": {
+  "packages": {
+    "": {
+      "name": "package.json",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@vant/weapp": "^1.3.1"
+      }
+    },
+    "node_modules/@vant/weapp": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.3.1.tgz",
       "integrity": "sha512-b4Kr1TUVRtoCKRphRvGYoQIKoSi2QBt3v4VrD6pwKOav3U3AVxKKLcqdCRkVMyTGsZrnwD/5se/HXcXA4ra9dg=="
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 86fd531..339d469 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -3,6 +3,14 @@
 var QQMapWX = require('../../libs/qqmap-wx-jssdk.js');
 var qqmapsdk;
 var app = getApp()
+const installTypeMap = {
+    '1': '初次安装',
+    '2': '初次拆走',
+    '3': '二次安装',
+    '4': '二次拆走',
+    '5': '正在维护',
+    '6': '其他',
+}
 Page({
 
   /**
@@ -59,7 +67,6 @@
       factory: "",
       workmsg: "",
       position: "",
-      description: "",
       longitude: "",
       latitude: "",
       longitude84: "",
@@ -73,6 +80,7 @@
       photopath2: '',
       photopath3: '',
       installType: '1', // 设备安装情况
+      description: "初次安装", // 备注
     },
     fileList: [],
     listQuery: {
@@ -165,19 +173,19 @@
         'projectName': app.globalData.selectProjectName,
     })
     console.log('ppp', that.data.form.project);
-    //初始化表单内容为上次填写值
-    var cacheForms = wx.getStorageSync('cacheList')
-    if (cacheForms) {
-      cacheForms.photopath1=''
-      cacheForms.photopath2=''
-      cacheForms.photopath3=''
-      that.data.fileList=[]
-      that.setData({
-        form: cacheForms,
-        devcode: cacheForms.devcode,
-      })
-    }
-    var form = that.data.form
+    //=========初始化表单内容为上次填写值==========
+    // var cacheForms = wx.getStorageSync('cacheList')
+    // if (cacheForms) {
+    //   cacheForms.photopath1=''
+    //   cacheForms.photopath2=''
+    //   cacheForms.photopath3=''
+    //   that.data.fileList=[]
+    //   that.setData({
+    //     form: cacheForms,
+    //     devcode: cacheForms.devcode,
+    //   })
+    // }
+    // var form = that.data.form
     //默认安装经纬度为当前位置(gcj02)
     wx.getLocation({
       type: "gcj02",
@@ -265,7 +273,6 @@
 
 
     //获取项目下拉列表
-
     wx.request({
       method: "POST",
       url: app.globalData.httpsUrl + "project/getProject",    
@@ -329,6 +336,12 @@
 
     // 粘贴经纬度
     this.paste()
+
+    // 处理备注的默认
+    var description = 'form.description';
+    that.setData({
+        [description]: installTypeMap[that.data.form.installType]
+    })
   },
 
 
@@ -368,6 +381,18 @@
   onPullDownRefresh: function () {
 
   },
+
+  //   监听页面滚动
+  onPageScroll(e) {
+    console.log('监听页面滚动');
+    var that = this
+    console.log(that.selectComponent('#selectPersonDropdown'));
+    // that.selectComponent('#selectPersonDropdown').triggerEvent(false)
+},
+
+toggle() {
+
+},
   //   点击检索
   searchWellCode() {
     if(!this.data.form.wellcode) {
@@ -768,8 +793,10 @@
   selectInstallType(value) {
     var that = this;
     var installType = 'form.installType';
+    var description = 'form.description';
     that.setData({
-      [installType]: value.detail
+      [installType]: value.detail,
+      [description]: installTypeMap[value.detail]
     })
   },
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 871ea29..037b327 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -69,8 +69,8 @@
 			<van-field disabled label="安装人员" border="{{ true }}" required/>
 		</van-col>
 		<van-col span="12">
-			<van-dropdown-menu active-color="#ffcf00">
-				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" />
+			<van-dropdown-menu active-color="#ffcf00" >
+				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" id="selectPersonDropdown"/>
 			</van-dropdown-menu>
 		</van-col>
 	</van-row>
@@ -96,7 +96,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" multiple file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>
diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js
index 3d45d89..5535c2f 100644
--- a/miniprogram/pages/applog/applog.js
+++ b/miniprogram/pages/applog/applog.js
@@ -92,7 +92,8 @@
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+      console.log('触发下拉刷新');
+    this.initPages(true)
   },
 
   /**
@@ -261,8 +262,11 @@
     that.setData({
       show: false
     })
-   
-    var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1
+      if(needClear) {
+     var offsetValue = 1
+   } else {
+     var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1
+   }
 
     wx.request({
       method: "POST",
@@ -313,6 +317,7 @@
             total: that.data.deviceloglist.length
           })
         }
+        wx.stopPullDownRefresh() // 下拉刷新回弹
       }
     })
 
diff --git a/miniprogram/pages/earth/earth.js b/miniprogram/pages/earth/earth.js
index 4099ea4..dbae2b9 100644
--- a/miniprogram/pages/earth/earth.js
+++ b/miniprogram/pages/earth/earth.js
@@ -390,8 +390,10 @@
       wx.navigateTo({
         url: '../addDevice/addDevice'
       })
-    } else if (2 == controlId) {
+    } else if (2 == controlId) { // 铅笔
+        console.log('点击铅笔')
       this.setData({
+        devcodes: "",
         show: true
       });
     } else if (4 == controlId) {
@@ -434,6 +436,8 @@
   //获取设备maker
   leave() {
     var that = this;
+    console.log(that.data)
+    console.log(that.data.devcodes)
     if (that.data.devcodes == "") {
         // that.setData({
         //     markers:[]
@@ -456,46 +460,58 @@
       success(res) {
         if (res.data.code == 200) {
           var listResultData = res.data.data;
-          that.setData({
-            listData: listResultData
-          })
-          var markersArr = []
-          for (var i = 0; i < listResultData.length; i++) {
-            let arr = {
-              iconPath: "../../images/locat.png",
-              id: Number(listResultData[i].id),
-              callout: {
-                content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
-                fontSize: '14',
-                // padding: true,
-                color: '#212121',
-                borderColor: '#F4EA2A',
-                bgColor: '#F4EA2A',
-                borderWidth: 5,
-                display: 'ALWAYS',
-                textAlign: 'left',
-                // borderRadius: 15
-                devcode: listResultData[i].devcode
-              },
-              latitude: listResultData[i].latitude,
-              longitude: listResultData[i].longitude,
-              width: 40,
-              height: 40,
-              devcode: listResultData[i].devcode
-            };
-            markersArr.push(arr)
+          if(!listResultData.length) {
+            wx.showToast({
+                title: "查无结果！",
+                icon: 'none',
+                duration: 2000
+              })
+            that.setData({
+                show: false
+            });
+          } else {
+            that.setData({
+                listData: listResultData
+              })
+              var markersArr = []
+              for (var i = 0; i < listResultData.length; i++) {
+                let arr = {
+                  iconPath: "../../images/locat.png",
+                  id: Number(listResultData[i].id),
+                  callout: {
+                    content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
+                    fontSize: '14',
+                    // padding: true,
+                    color: '#212121',
+                    borderColor: '#F4EA2A',
+                    bgColor: '#F4EA2A',
+                    borderWidth: 5,
+                    display: 'ALWAYS',
+                    textAlign: 'left',
+                    // borderRadius: 15
+                    devcode: listResultData[i].devcode
+                  },
+                  latitude: listResultData[i].latitude,
+                  longitude: listResultData[i].longitude,
+                  width: 40,
+                  height: 40,
+                  devcode: listResultData[i].devcode
+                };
+                markersArr.push(arr)
+              }
+              that.setData({
+                markers: markersArr,
+                latitude: listResultData[0].latitude,
+                longitude: listResultData[0].longitude,
+                marker_latitude: listResultData[0].latitude,
+                marker_longitude: listResultData[0].longitude,
+                title: listResultData[0].devcode
+              })
+              that.setData({
+                show: false
+              });
           }
-          that.setData({
-            markers: markersArr,
-            latitude: listResultData[0].latitude,
-            longitude: listResultData[0].longitude,
-            marker_latitude: listResultData[0].latitude,
-            marker_longitude: listResultData[0].longitude,
-            title: listResultData[0].devcode
-          })
-          that.setData({
-            show: false
-          });
+          
         }
       },
       fail(err) {
@@ -688,6 +704,7 @@
 
 
   confirmdevcodes: function (event) {
+      console.log('设备编号', event.detail.value);
     var that = this;
     that.setData({
       devcodes: event.detail.value

diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index db1c90a..163c743 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,8 @@
     // this.globalData = {}
   },
   globalData: {
-    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
-    httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
-    // httpsUrl: "https://gas.task.smartlog.work/", // 线上
+    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
     nickName:"",
diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json
index f9502d4..48cf461 100644
--- a/miniprogram/package-lock.json
+++ b/miniprogram/package-lock.json
@@ -1,10 +1,18 @@
 {
   "name": "package.json",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@vant/weapp": {
+  "packages": {
+    "": {
+      "name": "package.json",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@vant/weapp": "^1.3.1"
+      }
+    },
+    "node_modules/@vant/weapp": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.3.1.tgz",
       "integrity": "sha512-b4Kr1TUVRtoCKRphRvGYoQIKoSi2QBt3v4VrD6pwKOav3U3AVxKKLcqdCRkVMyTGsZrnwD/5se/HXcXA4ra9dg=="
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 86fd531..339d469 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -3,6 +3,14 @@
 var QQMapWX = require('../../libs/qqmap-wx-jssdk.js');
 var qqmapsdk;
 var app = getApp()
+const installTypeMap = {
+    '1': '初次安装',
+    '2': '初次拆走',
+    '3': '二次安装',
+    '4': '二次拆走',
+    '5': '正在维护',
+    '6': '其他',
+}
 Page({
 
   /**
@@ -59,7 +67,6 @@
       factory: "",
       workmsg: "",
       position: "",
-      description: "",
       longitude: "",
       latitude: "",
       longitude84: "",
@@ -73,6 +80,7 @@
       photopath2: '',
       photopath3: '',
       installType: '1', // 设备安装情况
+      description: "初次安装", // 备注
     },
     fileList: [],
     listQuery: {
@@ -165,19 +173,19 @@
         'projectName': app.globalData.selectProjectName,
     })
     console.log('ppp', that.data.form.project);
-    //初始化表单内容为上次填写值
-    var cacheForms = wx.getStorageSync('cacheList')
-    if (cacheForms) {
-      cacheForms.photopath1=''
-      cacheForms.photopath2=''
-      cacheForms.photopath3=''
-      that.data.fileList=[]
-      that.setData({
-        form: cacheForms,
-        devcode: cacheForms.devcode,
-      })
-    }
-    var form = that.data.form
+    //=========初始化表单内容为上次填写值==========
+    // var cacheForms = wx.getStorageSync('cacheList')
+    // if (cacheForms) {
+    //   cacheForms.photopath1=''
+    //   cacheForms.photopath2=''
+    //   cacheForms.photopath3=''
+    //   that.data.fileList=[]
+    //   that.setData({
+    //     form: cacheForms,
+    //     devcode: cacheForms.devcode,
+    //   })
+    // }
+    // var form = that.data.form
     //默认安装经纬度为当前位置(gcj02)
     wx.getLocation({
       type: "gcj02",
@@ -265,7 +273,6 @@
 
 
     //获取项目下拉列表
-
     wx.request({
       method: "POST",
       url: app.globalData.httpsUrl + "project/getProject",    
@@ -329,6 +336,12 @@
 
     // 粘贴经纬度
     this.paste()
+
+    // 处理备注的默认
+    var description = 'form.description';
+    that.setData({
+        [description]: installTypeMap[that.data.form.installType]
+    })
   },
 
 
@@ -368,6 +381,18 @@
   onPullDownRefresh: function () {
 
   },
+
+  //   监听页面滚动
+  onPageScroll(e) {
+    console.log('监听页面滚动');
+    var that = this
+    console.log(that.selectComponent('#selectPersonDropdown'));
+    // that.selectComponent('#selectPersonDropdown').triggerEvent(false)
+},
+
+toggle() {
+
+},
   //   点击检索
   searchWellCode() {
     if(!this.data.form.wellcode) {
@@ -768,8 +793,10 @@
   selectInstallType(value) {
     var that = this;
     var installType = 'form.installType';
+    var description = 'form.description';
     that.setData({
-      [installType]: value.detail
+      [installType]: value.detail,
+      [description]: installTypeMap[value.detail]
     })
   },
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 871ea29..037b327 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -69,8 +69,8 @@
 			<van-field disabled label="安装人员" border="{{ true }}" required/>
 		</van-col>
 		<van-col span="12">
-			<van-dropdown-menu active-color="#ffcf00">
-				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" />
+			<van-dropdown-menu active-color="#ffcf00" >
+				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" id="selectPersonDropdown"/>
 			</van-dropdown-menu>
 		</van-col>
 	</van-row>
@@ -96,7 +96,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" multiple file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>
diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js
index 3d45d89..5535c2f 100644
--- a/miniprogram/pages/applog/applog.js
+++ b/miniprogram/pages/applog/applog.js
@@ -92,7 +92,8 @@
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+      console.log('触发下拉刷新');
+    this.initPages(true)
   },
 
   /**
@@ -261,8 +262,11 @@
     that.setData({
       show: false
     })
-   
-    var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1
+      if(needClear) {
+     var offsetValue = 1
+   } else {
+     var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1
+   }
 
     wx.request({
       method: "POST",
@@ -313,6 +317,7 @@
             total: that.data.deviceloglist.length
           })
         }
+        wx.stopPullDownRefresh() // 下拉刷新回弹
       }
     })
 
diff --git a/miniprogram/pages/earth/earth.js b/miniprogram/pages/earth/earth.js
index 4099ea4..dbae2b9 100644
--- a/miniprogram/pages/earth/earth.js
+++ b/miniprogram/pages/earth/earth.js
@@ -390,8 +390,10 @@
       wx.navigateTo({
         url: '../addDevice/addDevice'
       })
-    } else if (2 == controlId) {
+    } else if (2 == controlId) { // 铅笔
+        console.log('点击铅笔')
       this.setData({
+        devcodes: "",
         show: true
       });
     } else if (4 == controlId) {
@@ -434,6 +436,8 @@
   //获取设备maker
   leave() {
     var that = this;
+    console.log(that.data)
+    console.log(that.data.devcodes)
     if (that.data.devcodes == "") {
         // that.setData({
         //     markers:[]
@@ -456,46 +460,58 @@
       success(res) {
         if (res.data.code == 200) {
           var listResultData = res.data.data;
-          that.setData({
-            listData: listResultData
-          })
-          var markersArr = []
-          for (var i = 0; i < listResultData.length; i++) {
-            let arr = {
-              iconPath: "../../images/locat.png",
-              id: Number(listResultData[i].id),
-              callout: {
-                content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
-                fontSize: '14',
-                // padding: true,
-                color: '#212121',
-                borderColor: '#F4EA2A',
-                bgColor: '#F4EA2A',
-                borderWidth: 5,
-                display: 'ALWAYS',
-                textAlign: 'left',
-                // borderRadius: 15
-                devcode: listResultData[i].devcode
-              },
-              latitude: listResultData[i].latitude,
-              longitude: listResultData[i].longitude,
-              width: 40,
-              height: 40,
-              devcode: listResultData[i].devcode
-            };
-            markersArr.push(arr)
+          if(!listResultData.length) {
+            wx.showToast({
+                title: "查无结果！",
+                icon: 'none',
+                duration: 2000
+              })
+            that.setData({
+                show: false
+            });
+          } else {
+            that.setData({
+                listData: listResultData
+              })
+              var markersArr = []
+              for (var i = 0; i < listResultData.length; i++) {
+                let arr = {
+                  iconPath: "../../images/locat.png",
+                  id: Number(listResultData[i].id),
+                  callout: {
+                    content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
+                    fontSize: '14',
+                    // padding: true,
+                    color: '#212121',
+                    borderColor: '#F4EA2A',
+                    bgColor: '#F4EA2A',
+                    borderWidth: 5,
+                    display: 'ALWAYS',
+                    textAlign: 'left',
+                    // borderRadius: 15
+                    devcode: listResultData[i].devcode
+                  },
+                  latitude: listResultData[i].latitude,
+                  longitude: listResultData[i].longitude,
+                  width: 40,
+                  height: 40,
+                  devcode: listResultData[i].devcode
+                };
+                markersArr.push(arr)
+              }
+              that.setData({
+                markers: markersArr,
+                latitude: listResultData[0].latitude,
+                longitude: listResultData[0].longitude,
+                marker_latitude: listResultData[0].latitude,
+                marker_longitude: listResultData[0].longitude,
+                title: listResultData[0].devcode
+              })
+              that.setData({
+                show: false
+              });
           }
-          that.setData({
-            markers: markersArr,
-            latitude: listResultData[0].latitude,
-            longitude: listResultData[0].longitude,
-            marker_latitude: listResultData[0].latitude,
-            marker_longitude: listResultData[0].longitude,
-            title: listResultData[0].devcode
-          })
-          that.setData({
-            show: false
-          });
+          
         }
       },
       fail(err) {
@@ -688,6 +704,7 @@
 
 
   confirmdevcodes: function (event) {
+      console.log('设备编号', event.detail.value);
     var that = this;
     that.setData({
       devcodes: event.detail.value
diff --git a/miniprogram/pages/earth/earth.wxml b/miniprogram/pages/earth/earth.wxml
index bbe0c4d..29cebae 100644
--- a/miniprogram/pages/earth/earth.wxml
+++ b/miniprogram/pages/earth/earth.wxml
@@ -6,11 +6,11 @@
 	</van-search>
 
 	<map id="map" longitude="{{longitude}}" latitude=" {{latitude}}" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap" bindcallouttap="bindcallouttap"   scale="20"  bindregionchange="bindregionchange" enable-satellite="{{enableSsatellite}}" scale="13" show-location style="width: 100%; height: 100%;">
-		<!-- <cover-view wx:if="{{isShow}}" class="map-search-list {{isShow ? '' : 'map-hide'}}">
+		<cover-view wx:if="{{isShow}}" class="map-search-list {{isShow ? '' : 'map-hide'}}">
 			<cover-view bindtouchstart="bindSearch" wx:key="searchId" data-keywords="{{item.title}}" data-location="{{item.location}}" class="map-box" wx:for="{{tips}}">
 				{{item.title}} {{item.address}}
 			</cover-view>
-		</cover-view> -->
+		</cover-view>
         <cover-view slot="callout">
         <!-- <cover-view class="zh-marker-label" marker-id="{{id}}">
             这是一个自定义气泡
@@ -37,6 +37,6 @@
 <van-popup show="{{ show }}"  position="bottom" custom-style="height: 800rpx" bind:close="onClose" >
 	<van-button bindtap="leave" type="primary" style="margin: 10px 10px 0 0;position: fixed;right: 0rpx;bottom: 700rpx;z-index: 100;">查询</van-button>
     <van-cell-group>
-		<van-field adjust-position="false" style="height: 100%;overflow: auto;"   type="textarea"  bind:blur="confirmdevcodes" placeholder="请输入定位设备编号用换行隔开" autosize border="{{ false }}" />
+		<van-field model:value="{{ devcodes }}" adjust-position="false" style="height: 100%;overflow: auto;"  type="textarea" placeholder="请输入定位设备编号用换行隔开" autosize border="{{ false }}" />
 	</van-cell-group>
 </van-popup>
\ No newline at end of file

diff --git a/miniprogram/.cloudbase/container/debug.json b/miniprogram/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/miniprogram/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index db1c90a..163c743 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,8 @@
     // this.globalData = {}
   },
   globalData: {
-    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
-    httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
-    // httpsUrl: "https://gas.task.smartlog.work/", // 线上
+    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
     nickName:"",
diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json
index f9502d4..48cf461 100644
--- a/miniprogram/package-lock.json
+++ b/miniprogram/package-lock.json
@@ -1,10 +1,18 @@
 {
   "name": "package.json",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@vant/weapp": {
+  "packages": {
+    "": {
+      "name": "package.json",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@vant/weapp": "^1.3.1"
+      }
+    },
+    "node_modules/@vant/weapp": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.3.1.tgz",
       "integrity": "sha512-b4Kr1TUVRtoCKRphRvGYoQIKoSi2QBt3v4VrD6pwKOav3U3AVxKKLcqdCRkVMyTGsZrnwD/5se/HXcXA4ra9dg=="
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 86fd531..339d469 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -3,6 +3,14 @@
 var QQMapWX = require('../../libs/qqmap-wx-jssdk.js');
 var qqmapsdk;
 var app = getApp()
+const installTypeMap = {
+    '1': '初次安装',
+    '2': '初次拆走',
+    '3': '二次安装',
+    '4': '二次拆走',
+    '5': '正在维护',
+    '6': '其他',
+}
 Page({
 
   /**
@@ -59,7 +67,6 @@
       factory: "",
       workmsg: "",
       position: "",
-      description: "",
       longitude: "",
       latitude: "",
       longitude84: "",
@@ -73,6 +80,7 @@
       photopath2: '',
       photopath3: '',
       installType: '1', // 设备安装情况
+      description: "初次安装", // 备注
     },
     fileList: [],
     listQuery: {
@@ -165,19 +173,19 @@
         'projectName': app.globalData.selectProjectName,
     })
     console.log('ppp', that.data.form.project);
-    //初始化表单内容为上次填写值
-    var cacheForms = wx.getStorageSync('cacheList')
-    if (cacheForms) {
-      cacheForms.photopath1=''
-      cacheForms.photopath2=''
-      cacheForms.photopath3=''
-      that.data.fileList=[]
-      that.setData({
-        form: cacheForms,
-        devcode: cacheForms.devcode,
-      })
-    }
-    var form = that.data.form
+    //=========初始化表单内容为上次填写值==========
+    // var cacheForms = wx.getStorageSync('cacheList')
+    // if (cacheForms) {
+    //   cacheForms.photopath1=''
+    //   cacheForms.photopath2=''
+    //   cacheForms.photopath3=''
+    //   that.data.fileList=[]
+    //   that.setData({
+    //     form: cacheForms,
+    //     devcode: cacheForms.devcode,
+    //   })
+    // }
+    // var form = that.data.form
     //默认安装经纬度为当前位置(gcj02)
     wx.getLocation({
       type: "gcj02",
@@ -265,7 +273,6 @@
 
 
     //获取项目下拉列表
-
     wx.request({
       method: "POST",
       url: app.globalData.httpsUrl + "project/getProject",    
@@ -329,6 +336,12 @@
 
     // 粘贴经纬度
     this.paste()
+
+    // 处理备注的默认
+    var description = 'form.description';
+    that.setData({
+        [description]: installTypeMap[that.data.form.installType]
+    })
   },
 
 
@@ -368,6 +381,18 @@
   onPullDownRefresh: function () {
 
   },
+
+  //   监听页面滚动
+  onPageScroll(e) {
+    console.log('监听页面滚动');
+    var that = this
+    console.log(that.selectComponent('#selectPersonDropdown'));
+    // that.selectComponent('#selectPersonDropdown').triggerEvent(false)
+},
+
+toggle() {
+
+},
   //   点击检索
   searchWellCode() {
     if(!this.data.form.wellcode) {
@@ -768,8 +793,10 @@
   selectInstallType(value) {
     var that = this;
     var installType = 'form.installType';
+    var description = 'form.description';
     that.setData({
-      [installType]: value.detail
+      [installType]: value.detail,
+      [description]: installTypeMap[value.detail]
     })
   },
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 871ea29..037b327 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -69,8 +69,8 @@
 			<van-field disabled label="安装人员" border="{{ true }}" required/>
 		</van-col>
 		<van-col span="12">
-			<van-dropdown-menu active-color="#ffcf00">
-				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" />
+			<van-dropdown-menu active-color="#ffcf00" >
+				<van-dropdown-item value="{{ form.installperson }}" options="{{ personoption1 }}" bind:change="selectpersonValue" id="selectPersonDropdown"/>
 			</van-dropdown-menu>
 		</van-col>
 	</van-row>
@@ -96,7 +96,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" multiple file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>
diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js
index 3d45d89..5535c2f 100644
--- a/miniprogram/pages/applog/applog.js
+++ b/miniprogram/pages/applog/applog.js
@@ -92,7 +92,8 @@
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+      console.log('触发下拉刷新');
+    this.initPages(true)
   },
 
   /**
@@ -261,8 +262,11 @@
     that.setData({
       show: false
     })
-   
-    var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1
+      if(needClear) {
+     var offsetValue = 1
+   } else {
+     var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1
+   }
 
     wx.request({
       method: "POST",
@@ -313,6 +317,7 @@
             total: that.data.deviceloglist.length
           })
         }
+        wx.stopPullDownRefresh() // 下拉刷新回弹
       }
     })
 
diff --git a/miniprogram/pages/earth/earth.js b/miniprogram/pages/earth/earth.js
index 4099ea4..dbae2b9 100644
--- a/miniprogram/pages/earth/earth.js
+++ b/miniprogram/pages/earth/earth.js
@@ -390,8 +390,10 @@
       wx.navigateTo({
         url: '../addDevice/addDevice'
       })
-    } else if (2 == controlId) {
+    } else if (2 == controlId) { // 铅笔
+        console.log('点击铅笔')
       this.setData({
+        devcodes: "",
         show: true
       });
     } else if (4 == controlId) {
@@ -434,6 +436,8 @@
   //获取设备maker
   leave() {
     var that = this;
+    console.log(that.data)
+    console.log(that.data.devcodes)
     if (that.data.devcodes == "") {
         // that.setData({
         //     markers:[]
@@ -456,46 +460,58 @@
       success(res) {
         if (res.data.code == 200) {
           var listResultData = res.data.data;
-          that.setData({
-            listData: listResultData
-          })
-          var markersArr = []
-          for (var i = 0; i < listResultData.length; i++) {
-            let arr = {
-              iconPath: "../../images/locat.png",
-              id: Number(listResultData[i].id),
-              callout: {
-                content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
-                fontSize: '14',
-                // padding: true,
-                color: '#212121',
-                borderColor: '#F4EA2A',
-                bgColor: '#F4EA2A',
-                borderWidth: 5,
-                display: 'ALWAYS',
-                textAlign: 'left',
-                // borderRadius: 15
-                devcode: listResultData[i].devcode
-              },
-              latitude: listResultData[i].latitude,
-              longitude: listResultData[i].longitude,
-              width: 40,
-              height: 40,
-              devcode: listResultData[i].devcode
-            };
-            markersArr.push(arr)
+          if(!listResultData.length) {
+            wx.showToast({
+                title: "查无结果！",
+                icon: 'none',
+                duration: 2000
+              })
+            that.setData({
+                show: false
+            });
+          } else {
+            that.setData({
+                listData: listResultData
+              })
+              var markersArr = []
+              for (var i = 0; i < listResultData.length; i++) {
+                let arr = {
+                  iconPath: "../../images/locat.png",
+                  id: Number(listResultData[i].id),
+                  callout: {
+                    content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
+                    fontSize: '14',
+                    // padding: true,
+                    color: '#212121',
+                    borderColor: '#F4EA2A',
+                    bgColor: '#F4EA2A',
+                    borderWidth: 5,
+                    display: 'ALWAYS',
+                    textAlign: 'left',
+                    // borderRadius: 15
+                    devcode: listResultData[i].devcode
+                  },
+                  latitude: listResultData[i].latitude,
+                  longitude: listResultData[i].longitude,
+                  width: 40,
+                  height: 40,
+                  devcode: listResultData[i].devcode
+                };
+                markersArr.push(arr)
+              }
+              that.setData({
+                markers: markersArr,
+                latitude: listResultData[0].latitude,
+                longitude: listResultData[0].longitude,
+                marker_latitude: listResultData[0].latitude,
+                marker_longitude: listResultData[0].longitude,
+                title: listResultData[0].devcode
+              })
+              that.setData({
+                show: false
+              });
           }
-          that.setData({
-            markers: markersArr,
-            latitude: listResultData[0].latitude,
-            longitude: listResultData[0].longitude,
-            marker_latitude: listResultData[0].latitude,
-            marker_longitude: listResultData[0].longitude,
-            title: listResultData[0].devcode
-          })
-          that.setData({
-            show: false
-          });
+          
         }
       },
       fail(err) {
@@ -688,6 +704,7 @@
 
 
   confirmdevcodes: function (event) {
+      console.log('设备编号', event.detail.value);
     var that = this;
     that.setData({
       devcodes: event.detail.value
diff --git a/miniprogram/pages/earth/earth.wxml b/miniprogram/pages/earth/earth.wxml
index bbe0c4d..29cebae 100644
--- a/miniprogram/pages/earth/earth.wxml
+++ b/miniprogram/pages/earth/earth.wxml
@@ -6,11 +6,11 @@
 	</van-search>
 
 	<map id="map" longitude="{{longitude}}" latitude=" {{latitude}}" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap" bindcallouttap="bindcallouttap"   scale="20"  bindregionchange="bindregionchange" enable-satellite="{{enableSsatellite}}" scale="13" show-location style="width: 100%; height: 100%;">
-		<!-- <cover-view wx:if="{{isShow}}" class="map-search-list {{isShow ? '' : 'map-hide'}}">
+		<cover-view wx:if="{{isShow}}" class="map-search-list {{isShow ? '' : 'map-hide'}}">
 			<cover-view bindtouchstart="bindSearch" wx:key="searchId" data-keywords="{{item.title}}" data-location="{{item.location}}" class="map-box" wx:for="{{tips}}">
 				{{item.title}} {{item.address}}
 			</cover-view>
-		</cover-view> -->
+		</cover-view>
         <cover-view slot="callout">
         <!-- <cover-view class="zh-marker-label" marker-id="{{id}}">
             这是一个自定义气泡
@@ -37,6 +37,6 @@
 <van-popup show="{{ show }}"  position="bottom" custom-style="height: 800rpx" bind:close="onClose" >
 	<van-button bindtap="leave" type="primary" style="margin: 10px 10px 0 0;position: fixed;right: 0rpx;bottom: 700rpx;z-index: 100;">查询</van-button>
     <van-cell-group>
-		<van-field adjust-position="false" style="height: 100%;overflow: auto;"   type="textarea"  bind:blur="confirmdevcodes" placeholder="请输入定位设备编号用换行隔开" autosize border="{{ false }}" />
+		<van-field model:value="{{ devcodes }}" adjust-position="false" style="height: 100%;overflow: auto;"  type="textarea" placeholder="请输入定位设备编号用换行隔开" autosize border="{{ false }}" />
 	</van-cell-group>
 </van-popup>
\ No newline at end of file
diff --git a/miniprogram/pages/indexapp/indexapp.wxml b/miniprogram/pages/indexapp/indexapp.wxml
index fd07fb5..6a29978 100644
--- a/miniprogram/pages/indexapp/indexapp.wxml
+++ b/miniprogram/pages/indexapp/indexapp.wxml
@@ -12,7 +12,7 @@
 	style="width: 100%; height: 100%; min-height:100%">
 	</map>
 </view>
-<van-search value="{{ devcode }}" shape="round"  label="设备编号" placeholder="根据设备编号搜索" use-action-slot bind:change="onChange" bind:search="onSearch">
+<van-search value="{{ devcode }}" shape="round"  label="编号" placeholder="根据设备编号/井编号搜索" use-action-slot bind:change="onChange" bind:search="onSearch">
 	<view slot="action" bind:tap="onClick">
 		<image class="scan-img" src="../../images/saoma.png"></image>
 	</view>