diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
deleted file mode 100644
index a16dec8..0000000
--- a/admin-web-master/dist.zip
+++ /dev/null
diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index 419e303..2f6b840 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import requestnew from '@/utils/request2'
+// import request from '@/utils/request2'
 // 生成合同附件
 export function dataInprotDocument(data) {
   return request({
@@ -155,7 +155,7 @@ export function cereResourceStrategy(data) {
 // ******商家管理******
 // 列表
 export function cerePlatformMerchant(data) {
-  return requestnew({
+  return request({
     url: '/cerePlatformMerchant/queryByPage',
     method: 'post',
     data
@@ -163,7 +163,7 @@ export function cerePlatformMerchant(data) {
 }
 // 添加
 export function cerePlatformMerchantadd(data) {
-  return requestnew({
+  return request({
     url: '/cerePlatformMerchant/add',
     method: 'post',
     data
@@ -171,7 +171,7 @@ export function cerePlatformMerchantadd(data) {
 }
 // 详情
 export function cerePlatformMerchantinfo(data) {
-  return requestnew({
+  return request({
     url: '/cerePlatformMerchant/queryById',
     method: 'post',
     data
@@ -179,7 +179,7 @@ export function cerePlatformMerchantinfo(data) {
 }
 // 修改
 export function cerePlatformMerchantedit(data) {
-    return requestnew({
+    return request({
       url: '/cerePlatformMerchant/edit',
       method: 'post',
       data
diff --git a/admin-web-master/src/components/add/addfa.vue b/admin-web-master/src/components/add/addfa.vue
index d09ffe1..df71a7a 100644
--- a/admin-web-master/src/components/add/addfa.vue
+++ b/admin-web-master/src/components/add/addfa.vue
@@ -12,7 +12,7 @@
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="24">
-          <el-form-item label="招商资源管理" prop="shopNumber">
+          <el-form-item label="招商资源管理" prop="resourceManagement">
             <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
               <div
                 style="font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;line-height:20px;background:#F2F3F5;">
@@ -163,6 +163,11 @@
             message: '请填写招商方案名称',
             trigger: 'change'
           }],
+          resourceManagement: [{
+            required: true,
+            message: '请选择招商资源',
+            trigger: 'change'
+          }]
         },
       };
     },
@@ -254,7 +259,9 @@
           }
         }
         this.AddData = listall
-        
+        if(this.AddData.length>0){
+          this.formInline.resourceManagement = '11'
+        }
         this.addcl = false
       },
       mingClosecl() {
diff --git a/admin-web-master/src/components/add/addsam.vue b/admin-web-master/src/components/add/addsam.vue
index 2e4e14c..ab53087 100644
--- a/admin-web-master/src/components/add/addsam.vue
+++ b/admin-web-master/src/components/add/addsam.vue
@@ -498,7 +498,7 @@
 
       },
       addM(e) {
-        this.formInline = e
+        this.formInline = JSON.parse(JSON.stringify(e))
         this.addMing = true
       },
       closemblist() {
@@ -526,10 +526,15 @@
         this.formInline[index] = c1
       },
       onSubmit() {
-
+        this.getmb()
       },
       resetting() {
-
+        this.querymb = {
+          pageNumber: 0,
+          pageSize: 10,
+          isTemplate: '0'
+        }
+        this.getmb()
       },
       handleSizeChange() {
 
diff --git a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
index 6f0f5d1..f48af38 100644
--- a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue
@@ -42,7 +42,7 @@
                 slot-scope="{date, data}">
                 {{data.day.split("-").slice(2).join("-")}}
               <div style="overflow: auto;height:55px;">
-                <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
+                <div style="width:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
                   <div style="font-size:12px;margin-top:10px;width:48%" >
                         {{item.negotiationTime == data.day?item.negotiationResult:''}}
                   </div>
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 410ef8f..61aebf5 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -406,9 +406,15 @@
         this.addcl = true
       },
       chenge(e) {
-        this.ontype = e
-        this.pagequery.pageNumber = 0
-        this.getAll()
+        this.ontype = null
+        // 延迟一秒执行
+        setTimeout(() => {
+          this.ontype = e
+          this.pagequery.pageNumber = 0
+          this.getAll()
+          this.$forceUpdate();
+        }, 10)
+        
       },
       gettime() {
         // 获取当前时间
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index 5cfc348..fc73961 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -288,7 +288,7 @@
     },
     data() {
       return {
-        onaction: '1',
+        onaction: '2',
         detailsinfo: {},
         formInline: {},
         upload: uploadUrl,
diff --git a/lvdao-miniapp/manifest.json b/lvdao-miniapp/manifest.json
index 00a708f..c759f17 100644
--- a/lvdao-miniapp/manifest.json
+++ b/lvdao-miniapp/manifest.json
@@ -1,140 +1,140 @@
 {
-	"name": "绿道",
-	"appid": "__UNI__F034047",
-	"description": "",
-	"versionName": "1.0.2",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"ad": {}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			},
-			"splashscreen": {
-				"android": {
-					"hdpi": "",
-					"xhdpi": "",
-					"xxhdpi": ""
-				},
-				"androidStyle": "default"
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx005c61919377e6af",
-		"setting": {
-			"urlCheck": false,
-			"es6": true,
-			"postcss": false,
-			"minified": true
-		},
-		"usingComponents": true,
-		"permission": {}
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"h5": {
-		"router": {
-			"mode": "hash",
-			"base": "./"
-		},
-		"title": "商城",
-		"devServer": {
-			"https": false
-		},
-		"domain": "",
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
-				}
-			}
-		},
-		"template": "home.vue"
-	}
-}
\ No newline at end of file
+    "name" : "绿道",
+    "appid" : "__UNI__189D96A",
+    "description" : "",
+    "versionName" : "1.0.2",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "android" : {
+                    "hdpi" : "",
+                    "xhdpi" : "",
+                    "xxhdpi" : ""
+                },
+                "androidStyle" : "default"
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx005c61919377e6af",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : true,
+            "postcss" : false,
+            "minified" : true
+        },
+        "usingComponents" : true,
+        "permission" : {}
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "h5" : {
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        },
+        "title" : "商城",
+        "devServer" : {
+            "https" : false
+        },
+        "domain" : "",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
+                }
+            }
+        },
+        "template" : "home.vue"
+    }
+}