Signed-off-by: 不吃茄子的阿宝 <528046418@qq.com>

config/index.js

@@ -1,7 +1,8 @@
 export default {
     base: {
-      dev: 'http://47.113.222.56:7001',
-      pro: 'http://47.113.222.56:7001'
+      // dev: 'http://47.113.222.56:7001',
+	  dev: 'https://api.hchzhhnm.xarbkj.net',
+      pro: 'https://api.hchzhhnm.xarbkj.net'
     },
 	// appID: '10031',
 	// appKey: '82a8bf439373e331',

manifest.json

@@ -50,14 +50,15 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxee54338450a52d40",
+        "appid" : "wxb2392d22b9ed05f7",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "es6" : true
         },
         "usingComponents" : true,
-		"optimization": {
-			"subPackages": true
-		}
+        "optimization" : {
+            "subPackages" : true
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

pages/index/index.vue

@@ -71,12 +71,12 @@
 								 <text>{{duty.posName}}</text>
 							 </view>							
 							<view class="posbox">
-								 <view class="groupName">
-									<uni-tag :inverted="true" :text="duty.groupName" type="primary"></uni-tag>
-								</view>
 								 <view class="positionName">
-									<uni-tag :inverted="true" :text="duty.positionName" type="success"></uni-tag>	
-								 </view>								
+									<uni-tag :inverted="true" :text="duty.positionName" type="success" size="small"></uni-tag>	
+								 </view>	
+								 <view class="groupName">
+									<uni-tag :inverted="true" :text="duty.groupName" type="primary" size="small"></uni-tag>
+								</view>															 
 							</view>
 						</view>
 						<view class="bottom">
@@ -375,10 +375,23 @@
 				}
 			}
 			.posbox{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
+				// display: flex;
+				// align-items: center;
+				// justify-content: space-between;
 				padding: 20rpx 0;
+				// .groupName,.positionName{
+				// 	width: 45%;
+				// 	overflow: hidden;
+				// 	text-overflow: ellipsis;
+				// 	&.positionName{
+				// 		display: flex;
+				// 		align-items: center;
+				// 		justify-content: flex-end;
+				// 	}
+				// }
+				.groupName{
+					margin-top: 16rpx;
+				}
 			}
 			.info{
 				flex: 1;

pages/login/index.vue

@@ -39,8 +39,8 @@
 					}					
 				},
 				form:{
-					username:"admin003",
-					password:"888888"
+					username:"",
+					password:""
 				}
 			}
 		},

pages/webview/webview.vue

@@ -9,7 +9,7 @@
 			return {
 				src:'',
 				title:"",
-				h5:'http://127.0.0.1:5500/index.html'
+				h5:'https://hchzhhnm.xarbkj.net/camera/index.html'
 			}
 		},
 		onLoad({id,title}) {

unpackage/dist/dev/mp-weixin/packageA/common/vendor.js

@@ -1,132 +1,2 @@
-(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["packageA/common/vendor"],{
-
-/***/ 119:
-/*!********************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/api/disaster.js ***!
-  \********************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _request = __webpack_require__(/*! @/libs/request.js */ 31);
-var _default = {
-  /*地质*/
-  // 分页查询
-  getDisasterLocationByPage: function getDisasterLocationByPage(data) {
-    return (0, _request.request)({
-      url: '/disaster/location/page',
-      data: data
-    });
-  },
-  // 列表查询
-  getDisasterLocationByList: function getDisasterLocationByList(data) {
-    return (0, _request.request)({
-      url: '/disaster/location',
-      data: data
-    });
-  },
-  // 基于ID查询
-  getDisasterLocationById: function getDisasterLocationById(id) {
-    return (0, _request.request)({
-      url: "/disaster/location/".concat(id)
-    });
-  },
-  // 新增
-  createDisasterLocation: function createDisasterLocation(data) {
-    return (0, _request.request)({
-      url: '/disaster/location/add',
-      method: "post",
-      data: data
-    });
-  },
-  // 更新
-  updateDisasterLocation: function updateDisasterLocation(data) {
-    return (0, _request.request)({
-      url: '/disaster/location/update',
-      method: "put",
-      data: data
-    });
-  },
-  // 删除
-  deleteDisasterLocationById: function deleteDisasterLocationById(id) {
-    return (0, _request.request)({
-      url: "/disaster/location/".concat(id),
-      method: "delete"
-    });
-  },
-  // 规模等级列表
-  getDisasterLevelByList: function getDisasterLevelByList(data) {
-    return (0, _request.request)({
-      url: '/disaster/level',
-      data: data
-    });
-  },
-  // 灾害类型列表查询
-  getDisasterCatByList: function getDisasterCatByList(data) {
-    return (0, _request.request)({
-      url: '/disaster/cat',
-      data: data
-    });
-  },
-  /*自然*/
-  getReservoirDamByPage: function getReservoirDamByPage(data) {
-    return (0, _request.request)({
-      url: '/reservoir/dam/page',
-      data: data
-    });
-  },
-  // 列表查询
-  getReservoirDamByList: function getReservoirDamByList(data) {
-    return (0, _request.request)({
-      url: '/reservoir/dam',
-      data: data
-    });
-  },
-  // 基于ID查询
-  getReservoirDamById: function getReservoirDamById(id) {
-    return (0, _request.request)({
-      url: "/reservoir/dam/".concat(id)
-    });
-  },
-  // 新增
-  createReservoirDam: function createReservoirDam(data) {
-    return (0, _request.request)({
-      url: '/reservoir/dam/add',
-      method: "post",
-      data: data
-    });
-  },
-  // 更新
-  updateReservoirDam: function updateReservoirDam(data) {
-    return (0, _request.request)({
-      url: '/reservoir/dam/update',
-      method: "put",
-      data: data
-    });
-  },
-  // 删除
-  deleteReservoirDamById: function deleteReservoirDamById(id) {
-    return (0, _request.request)({
-      url: "/reservoir/dam/".concat(id),
-      method: "delete"
-    });
-  },
-  // 基于ID查询
-  getCameraByListWithLocation: function getCameraByListWithLocation(id) {
-    return (0, _request.request)({
-      url: "/camera/location/".concat(id)
-    });
-  }
-};
-exports.default = _default;
-
-/***/ })
-
-}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["packageA/common/vendor"],{125:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a=r(31),o={getDisasterLocationByPage:function(e){return(0,a.request)({url:"/disaster/location/page",data:e})},getDisasterLocationByList:function(e){return(0,a.request)({url:"/disaster/location",data:e})},getDisasterLocationById:function(e){return(0,a.request)({url:"/disaster/location/".concat(e)})},createDisasterLocation:function(e){return(0,a.request)({url:"/disaster/location/add",method:"post",data:e})},updateDisasterLocation:function(e){return(0,a.request)({url:"/disaster/location/update",method:"put",data:e})},deleteDisasterLocationById:function(e){return(0,a.request)({url:"/disaster/location/".concat(e),method:"delete"})},getDisasterLevelByList:function(e){return(0,a.request)({url:"/disaster/level",data:e})},getDisasterCatByList:function(e){return(0,a.request)({url:"/disaster/cat",data:e})},getReservoirDamByPage:function(e){return(0,a.request)({url:"/reservoir/dam/page",data:e})},getReservoirDamByList:function(e){return(0,a.request)({url:"/reservoir/dam",data:e})},getReservoirDamById:function(e){return(0,a.request)({url:"/reservoir/dam/".concat(e)})},createReservoirDam:function(e){return(0,a.request)({url:"/reservoir/dam/add",method:"post",data:e})},updateReservoirDam:function(e){return(0,a.request)({url:"/reservoir/dam/update",method:"put",data:e})},deleteReservoirDamById:function(e){return(0,a.request)({url:"/reservoir/dam/".concat(e),method:"delete"})},getCameraByListWithLocation:function(e){return(0,a.request)({url:"/camera/location/".concat(e)})}};t.default=o}}]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/packageA/common/vendor.js.map

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -128,11 +128,11 @@
   height: 60rpx;
 }
 .page-wrap .duty-conatiner .duty-item .posbox.data-v-57280228 {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
   padding: 20rpx 0;
 }
+.page-wrap .duty-conatiner .duty-item .posbox .groupName.data-v-57280228 {
+  margin-top: 16rpx;
+}
 .page-wrap .duty-conatiner .duty-item .info.data-v-57280228 {
   flex: 1;
   padding: 0 14rpx;