diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
new file mode 100644
index 0000000..9799caf
--- /dev/null
+++ b/admin-web-master/dist.zip
diff --git a/admin-web-master/src/components/add/addsam.vue b/admin-web-master/src/components/add/addsam.vue
index 4ad82b3..90587c5 100644
--- a/admin-web-master/src/components/add/addsam.vue
+++ b/admin-web-master/src/components/add/addsam.vue
@@ -12,13 +12,14 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="策略模板" prop="policyTemplate">
-        <el-select v-model="ruleForm.policyTemplate" placeholder="请选择" style="width:calc(100% - 100px);" @change="changeMode">
+        <el-select v-model="ruleForm.policyTemplate" placeholder="请选择" style="width:calc(100% - 100px);"
+          @change="changeMode">
           <el-option :label="item.policyName" :value="item.id" v-for="(item,index) in tableData" />
         </el-select>
         <el-button style="background-color: #3F9B6A;color: #fff;float: right;" @click="modeCode = true">管理模板
         </el-button>
       </el-form-item>
-      <el-row v-if="ruleForm.applicableResources == '商铺'">
+      <el-row>
         <el-col :span="12">
           <el-form-item label="是否出租" prop="isRental">
             <el-select v-model="ruleForm.isRental" placeholder="请选择" style="width: 100%;">
@@ -27,78 +28,16 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="ruleForm.applicableResources == '商铺'">
           <el-form-item label="经营类型" prop="businessType">
             <el-select v-model="ruleForm.businessType" placeholder="请选择" style="width: 100%;">
               <el-option label="超市" value="超市" />
               <el-option label="鞋店" value="鞋店" />
               <el-option label="家居饰品店" value="家居饰品店" />
             </el-select>
-            <!-- <el-input v-model="ruleForm.businessType" placeholder="请输入" maxlength="50"></el-input> -->
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="ruleForm.applicableResources == '商铺'">
-        <el-col :span="12">
-          <el-form-item label="租金" prop="rentalPrice">
-            <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30">
-              <template slot="suffix"><span
-                  style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="付款周期" prop="leaseTerm">
-            <el-select v-model="ruleForm.leaseTerm" placeholder="请选择" style="width: 100%;">
-              <el-option label="日" value="日" />
-              <el-option label="月" value="月" />
-              <el-option label="季" value="季" />
-              <el-option label="年" value="年" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="ruleForm.applicableResources == '商铺'">
-        <el-col :span="12">
-          <el-form-item label="租赁时段" prop="leaseDate">
-            <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
-              style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="免租条件" prop="rentFreeCondition">
-            <el-input v-model="ruleForm.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="ruleForm.applicableResources == '商铺'">
-        <el-col :span="12">
-          <el-form-item label="免租期" prop="rentFreePeriod">
-            <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;">
-              <el-option :label="item" :value="item" v-for="item in 31" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="付款日" prop="payDay">
-            <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;">
-              <el-option :label="item" :value="item" v-for="item in 31" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'">
-        <el-col :span="12">
-          <el-form-item label="是否出租" prop="isRental">
-            <el-select v-model="ruleForm.isRental" placeholder="请选择" style="width: 100%;">
-              <el-option label="自营" value="0" />
-              <el-option label="是" value="1" />
-            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="ruleForm.isRental !== '0'">
           <el-form-item label="租金价格" prop="rentalPrice">
             <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30">
               <template slot="suffix"><span
@@ -106,10 +45,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'">
-
-        <el-col :span="12">
+        <el-col :span="12" v-if="ruleForm.isRental !== '0'">
           <el-form-item label="付款周期" prop="leaseTerm">
             <el-select v-model="ruleForm.leaseTerm" placeholder="请选择" style="width: 100%;">
               <el-option label="日" value="日" />
@@ -120,29 +56,25 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="租赁时段" prop="leaseDate">
+          <el-form-item :label="ruleForm.isRental !== '0'?'租赁时段':'使用周期'" prop="leaseDate">
             <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
               style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'">
-        <el-col :span="12">
+        <el-col :span="12" v-if="ruleForm.isRental !== '0'">
           <el-form-item label="免租条件" prop="rentFreeCondition">
             <el-input v-model="ruleForm.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="ruleForm.isRental !== '0'">
           <el-form-item label="免租期" prop="rentFreePeriod">
             <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;">
               <el-option :label="item" :value="item" v-for="item in 31" />
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'">
-        <el-col :span="12">
+        <el-col :span="12" v-if="ruleForm.isRental !== '0'">
           <el-form-item label="付款日" prop="payDay">
             <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;">
               <el-option :label="item" :value="item" v-for="item in 31" />
@@ -150,20 +82,12 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="优惠政策" prop="preferentialPolicy">
-            <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="其他说明" prop="otherDescription">
-            <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="100"></wangEditor>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item v-if="ruleForm.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
+        <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor>
+      </el-form-item>
+      <el-form-item label="其他说明" prop="otherDescription">
+        <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="100"></wangEditor>
+      </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item>
@@ -214,32 +138,32 @@
           <el-table :data="tableData"
             :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
             <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index +1}}
-            </template>
-          </el-table-column>
+              <template slot-scope="scope">
+                {{scope.$index +1}}
+              </template>
+            </el-table-column>
             <el-table-column label="策略名称" prop="policyName">
             </el-table-column>
             <el-table-column label="适用资源" prop="applicableResources">
             </el-table-column>
-            <el-table-column label="经营类型" prop="businessType" >
+            <el-table-column label="经营类型" prop="businessType">
             </el-table-column>
-            <el-table-column prop="rentalPrice" label="租金/周期" >
+            <el-table-column prop="rentalPrice" label="租金/周期">
               <template slot-scope="scope">
                 {{scope.row.rentalPrice}}/{{scope.row.leaseTerm}}
               </template>
             </el-table-column>
-            <el-table-column label="付款日" >
+            <el-table-column label="付款日">
               <template slot-scope="scope">
                 {{scope.row.payDay}}
               </template>
             </el-table-column>
-            <el-table-column label="是否出租" prop="isRental" >
+            <el-table-column label="是否出租" prop="isRental">
               <template slot-scope="scope">
                 {{scope.row.isrental == '0'?'自营':'是'}}
               </template>
             </el-table-column>
-            <el-table-column label="操作" >
+            <el-table-column label="操作">
               <template slot-scope="scope">
                 <div @click="addM(scope.row)" class="tableBtn greens">编辑</div>
                 <div @click="delM(scope.row.id)" class="tableBtn greens">删除</div>
@@ -248,9 +172,9 @@
           </el-table>
           <div style="display: flex;justify-content: space-between;" class="bom">
             <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
-            <el-pagination :current-page="querymb.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="querymb.pageSize"
-              background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
-              @current-change="handleCurrentChange">
+            <el-pagination :current-page="querymb.pageNumber+1" :page-sizes="[10, 20, 50, 100]"
+              :page-size="querymb.pageSize" background small layout="prev, pager, next" :total="total"
+              @size-change="handleSizeChange" @current-change="handleCurrentChange">
             </el-pagination>
           </div>
           <div style="margin-top:20px;">
@@ -259,8 +183,8 @@
           </div>
         </div>
       </div>
-      <el-dialog :title="formInline.id?'编辑模板':'新增模板'" :visible.sync="addMing" custom-class='bian_css' style="padding: 0;"
-        width="65%" center :close-on-click-modal="false" :show-close="false" append-to-body>
+      <el-dialog :title="formInline.id?'编辑模板':'新增模板'" :visible.sync="addMing" custom-class='bian_css'
+        style="padding: 0;" width="65%" center :close-on-click-modal="false" :show-close="false" append-to-body>
         <div style="padding:20px;">
           <el-form :model="formInline" :rules="rulesSt2" ref="formInline" label-width="130px" class="demo-ruleForm">
             <el-form-item label="策略名称" prop="policyName">
@@ -273,7 +197,7 @@
                 <el-radio label="广告位" value="广告位">广告位</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-row v-if="formInline.applicableResources == '商铺'">
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="是否出租" prop="isRental">
                   <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 100%;">
@@ -282,78 +206,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="12" v-if="formInline.applicableResources == '商铺'">
                 <el-form-item label="经营类型" prop="businessType">
                   <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 100%;">
                     <el-option label="超市" value="超市" />
                     <el-option label="鞋店" value="鞋店" />
                     <el-option label="家居饰品店" value="家居饰品店" />
                   </el-select>
-                  <!-- <el-input v-model="formInline.businessType" placeholder="请输入" maxlength="50"></el-input> -->
-
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row v-if="formInline.applicableResources == '商铺'">
-              <el-col :span="12">
-                <el-form-item label="租金" prop="rentalPrice">
-                  <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30">
-                    <template slot="suffix"><span
-                        style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="付款周期" prop="leaseTerm">
-                  <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 100%;">
-                    <el-option label="日" value="日" />
-                    <el-option label="月" value="月" />
-                    <el-option label="季" value="季" />
-                    <el-option label="年" value="年" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row v-if="formInline.applicableResources == '商铺'">
-              <el-col :span="12">
-                <el-form-item label="租赁时段" prop="leaseDate">
-                  <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
-                    style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="免租条件" prop="rentFreeCondition">
-                  <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row v-if="formInline.applicableResources == '商铺'">
-              <el-col :span="12">
-                <el-form-item label="免租期" prop="rentFreePeriod">
-                  <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;">
-                    <el-option :label="item" :value="item" v-for="item in 31" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="付款日" prop="payDay">
-                  <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;">
-                    <el-option :label="item" :value="item" v-for="item in 31" />
-                  </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'">
-              <el-col :span="12">
-                <el-form-item label="是否出租" prop="isRental">
-                  <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 100%;">
-                    <el-option label="自营" value="0" />
-                    <el-option label="是" value="1" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
+              <el-col :span="12" v-if="formInline.isRental !== '0'">
                 <el-form-item label="租金价格" prop="rentalPrice">
                   <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30">
                     <template slot="suffix"><span
@@ -361,9 +223,7 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'">
-              <el-col :span="12">
+              <el-col :span="12" v-if="formInline.isRental !== '0'">
                 <el-form-item label="付款周期" prop="leaseTerm">
                   <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 100%;">
                     <el-option label="日" value="日" />
@@ -374,29 +234,25 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="租赁时段" prop="leaseDate">
+                <el-form-item :label="formInline.isRental !== '0'?'租赁时段':'使用周期'" prop="leaseDate">
                   <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
                     style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'">
-              <el-col :span="12">
+              <el-col :span="12" v-if="formInline.isRental !== '0'">
                 <el-form-item label="免租条件" prop="rentFreeCondition">
                   <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="12" v-if="formInline.isRental !== '0'">
                 <el-form-item label="免租期" prop="rentFreePeriod">
                   <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;">
                     <el-option :label="item" :value="item" v-for="item in 31" />
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'">
-              <el-col :span="12">
+              <el-col :span="12" v-if="formInline.isRental !== '0'">
                 <el-form-item label="付款日" prop="payDay">
                   <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;">
                     <el-option :label="item" :value="item" v-for="item in 31" />
@@ -404,20 +260,12 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="优惠政策" prop="preferentialPolicy">
-                  <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="其他说明" prop="otherDescription">
-                  <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor>
-                </el-form-item>
-              </el-col>
-            </el-row>
+            <el-form-item v-if="formInline.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
+              <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
+            </el-form-item>
+            <el-form-item label="其他说明" prop="otherDescription">
+              <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor>
+            </el-form-item>
           </el-form>
           <div style="display: flex;justify-content: flex-end;margin-top:20px;">
             <el-button @click="closemb()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
@@ -445,8 +293,8 @@
     },
     data() {
       return {
-        addMing:false,
-        modeAdd:false,
+        addMing: false,
+        modeAdd: false,
         modeCode: false,
         leaseDate: [], //租赁时段
         paymentDate: [], //付款日期
@@ -577,12 +425,12 @@
             }
           ],
         },
-        querymb:{
+        querymb: {
           pageNumber: 0,
           pageSize: 10,
           isTemplate: '0'
         },
-        total:0
+        total: 0
       };
     },
     props: {
@@ -674,9 +522,11 @@
         this.total = res.data.totalElements
       },
       addmb() {
-        console.error({...this.formInline})
-        this.formInline.isTemplate  = '0'
-        if(this.formInline.id) {
+        console.error({
+          ...this.formInline
+        })
+        this.formInline.isTemplate = '0'
+        if (this.formInline.id) {
           if (this.leaseDate.length != 0) {
             this.formInline.leaseStartDate = this.leaseDate[0]
             this.formInline.leaseEndDate = this.leaseDate[1]
@@ -752,8 +602,8 @@
         return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
       },
       add() {
-        this.ruleForm.isTemplate  = '1'
-        if(this.ruleForm.id) {
+        this.ruleForm.isTemplate = '1'
+        if (this.ruleForm.id) {
           if (this.leaseDate.length != 0) {
             this.ruleForm.leaseStartDate = this.leaseDate[0]
             this.ruleForm.leaseEndDate = this.leaseDate[1]
@@ -876,7 +726,7 @@
       height: 32px;
     }
   }
-  
+
   .formSearch {
     display: flex;
     width: 100%;
diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue
index d99d1c5..91d19cc 100644
--- a/admin-web-master/src/components/chakan/map.vue
+++ b/admin-web-master/src/components/chakan/map.vue
@@ -93,13 +93,27 @@
                 <el-form-item label="备注信息" prop="memo" v-if="editbgid.advertisingType == '线上广告位'">
                   <div class="duiqi">{{editbgid.memo || '无'}}</div>
                 </el-form-item>
-
-
-                
-
-
-
               </el-form>
+              <TitleWithCircle title="历史发布/下架记录" />
+              <div style="padding: 20px;">
+                <el-table :data="datalistxsj"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="类型" prop="type" >
+                  </el-table-column>
+                  <el-table-column label="操作时间" prop="operationTime" >
+                  </el-table-column>
+                  <el-table-column label="操作人" prop="operator">
+                  </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div>
+                  <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize"
+                    background small layout="prev, pager, next" :total="totalsxj" @size-change="handleSizeChangesxj"
+                    @current-change="handleCurrentChangesxj">
+                  </el-pagination>
+                </div>
+              </div>
             </div>
           </div>
         </el-tab-pane>
@@ -161,6 +175,7 @@
   import MapXian from "@/components/MapContainer/MapXian";
   import TitleWithCircle from '@/components/top/index';
   import {
+    cereBusinessOperationqueryByPage,
     cereResourceStrategylist,
     cereBusinessPlan
   } from '@/api/newly';
@@ -184,6 +199,13 @@
     },
     data() {
       return {
+        datalistxsj:[],
+        totalsxj:0,
+        pagequerysxj:{
+          pageNumber: 0,
+          pageSize: 10,
+          resourcesId: 'sp' + this.editbgid.id
+        },
         xiangTab: 'first',
         list: [],
         parentMessage: {},
@@ -214,6 +236,7 @@
           }
           this.datalist1 = res.data
         })
+        this.getAllxsj()
       }
 
 
@@ -222,6 +245,26 @@
 
     },
     methods: {
+      handleCurrentChangesxj(val) {
+        this.pagequerysxj.pageNumber = val - 1
+        this.getAllxsj()
+      },
+      handleSizeChangesxj(val) {
+        this.pagequerysxj.pageSize = val
+        this.pagequerysxj.pageNumber = 0
+        this.getAllxsj()
+      },
+      getAllxsj() {
+        cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistxsj = [];
+            return;
+          }
+          this.datalistxsj = res.data.content
+          this.totalsxj = res.data.totalElements
+        })
+      },
       changetype() {
         this.xiangTab = 'first'
         this.$emit('removeonaction', '1')
diff --git a/admin-web-master/src/components/chakan/sam.vue b/admin-web-master/src/components/chakan/sam.vue
index ba20be5..0babe76 100644
--- a/admin-web-master/src/components/chakan/sam.vue
+++ b/admin-web-master/src/components/chakan/sam.vue
@@ -2,131 +2,82 @@
   <div>
     <div>
       <el-tabs v-model="xiangTab">
-        <el-tab-pane label="资源信息" name="first">
+        <el-tab-pane label="策略信息" name="first">
           <div style="margin-top: 30px;" class="editcss">
             <TitleWithCircle title="基础信息" />
             <div style="padding: 20px;">
               <el-form :model="editbgid" ref="formInline" label-width="120px" class="demo-ruleForm">
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="场地名称" prop="venueName">
-                      <div class="duiqi">{{editbgid.venueName  || '无'}}</div>
+                    <el-form-item label="策略名称" prop="policyName">
+                      <div class="duiqi">{{editbgid.policyName  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="场地类型" prop="venueType">
-                      <div class="duiqi">{{editbgid.venueType  || '无'}}</div>
+                    <el-form-item label="适用资源" prop="applicableResources">
+                      <div class="duiqi">{{editbgid.applicableResources  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="实际使用面积" prop="actualArea">
-                      <div class="duiqi">{{editbgid.actualArea  || '无'}}</div>
+                    <el-form-item label="是否出租" prop="isRental">
+                      <div class="duiqi">{{editbgid.isRental=='0'?'自营':editbgid.isRental=='1'?'是':'无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="所属区域" prop="district">
-                      <div  class="duiqi">{{editbgid.district  || '无'}}</div>
+                    <el-form-item label="付款日" prop="payDay">
+                      <div  class="duiqi">{{editbgid.payDay  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="归属部门" prop="department">
-                      <div  class="duiqi">{{editbgid.department  || '无'}}</div>
+                    <el-form-item label="租金" prop="rentalPrice">
+                      <div  class="duiqi">{{editbgid.rentalPrice  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="负责人" prop="responsiblePerson">
-                      <div  class="duiqi">{{editbgid.belongingParkTrail  || '无'}}</div>
+                    <el-form-item label="付款周期" prop="leaseTerm">
+                      <div  class="duiqi">{{editbgid.leaseTerm  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="联系人" prop="contact">
+                    <el-form-item label="租赁时段" prop="contact">
                       <div  class="duiqi">{{editbgid.contact  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="联系电话" prop="phoneNumber">
-                      <div  class="duiqi">{{editbgid.belongingParkTrail  || '无'}}</div>
+                    <el-form-item label="免租条件" prop="rentFreeCondition">
+                      <div  class="duiqi">{{editbgid.rentFreeCondition  || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="免租期" prop="rentFreePeriod">
+                      <div  class="duiqi">{{editbgid.rentFreePeriod  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-form-item label="详细位置" prop="detailedLocation">
-                    <div  class="duiqi">{{editbgid.detailedLocation  || '无'}}</div>
-                </el-form-item>
-                <el-form-item label="地图标点" prop="mapMarker">
-                  <div style="width: 100%;height: 300px;">
-                    <newmap :isx="false" :message="editbgid.mapMarker"></newmap>
-                  </div>
-                </el-form-item>
-                <el-form-item label="场地描述" prop="description">
-                  <div  class="duiqi">{{editbgid.description  || '无'}}</div>
-                </el-form-item>
-                <el-form-item label="规划图纸" prop="planningDrawing">
-                  <div v-if="editbgid.planningDrawing">
-                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
-                      v-for="item in editbgid.planningDrawing.split(',')">
-                  </div>
-                  <div  class="duiqi" v-else>无</div>
-                </el-form-item>
-                <el-form-item label="展示主图" prop="displayImage">
-                  <div >
-                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
-                      v-for="item in editbgid.displayImage.split(',')">
-                  </div>
+                <el-row v-if="editbgid.applicableResources == '商铺'">
+                  <el-col :span="8" >
+                    <el-form-item label="经营类型" prop="businessType">
+                      <div  class="duiqi" >{{editbgid.businessType  || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="优惠政策" prop="preferentialPolicy">
+                  <div  class="duiqi" v-if="editbgid.preferentialPolicy" v-html="editbgid.preferentialPolicy"></div>
+                  <div class="duiqi" v-else>无</div>
                 </el-form-item>
-                <el-form-item label="其他视频" prop="otherImageVideos"  >
-                  <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div>
+                <el-form-item label="其他说明" prop="otherDescription">
+                  <div v-if="editbgid.otherDescription"  class="duiqi" v-html="editbgid.otherDescription"></div>
+                  <div class="duiqi" v-else>无</div>
                 </el-form-item>
               </el-form>
             </div>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="招商方案信息" name="second">
-          <div style="margin-top: 30px;" class="editcss">
-            <!-- <TitleWithCircle title="招商方案信息" />
-            <div style="padding: 20px;">
-              <el-table :data="datalist1"
-                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                tooltip-effect="dark custom-tooltip-effect">
-                <el-table-column label="招商方案名称" prop="planName" min-width="200">
-                </el-table-column>
-                <el-table-column label="创建日期" prop="createTime" min-width="100">
-                </el-table-column>
-              </el-table>
-            </div> -->
-            <TitleWithCircle title="策略方案" />
-            <div style="padding: 20px;">
-              <el-table :data="datalist"
-                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                tooltip-effect="dark custom-tooltip-effect">
-                <el-table-column label="策略名称" prop="policyName" min-width="200">
-                </el-table-column>
-                <el-table-column label="适用资源" prop="applicableResources" min-width="100">
-                </el-table-column>
-                <el-table-column label="经营类型" prop="businessType" min-width="100">
 
-                </el-table-column>
-                <el-table-column label="租金价格" prop="rentalPrice" min-width="150">
-                </el-table-column>
-                <el-table-column label="租期" prop="leaseTerm" min-width="100">
-                </el-table-column>
-                <el-table-column label="是否出租" prop="isRental" min-width="100">
-                  <template slot-scope="scope">
-                    {{scope.row.isRental == '0'?'否':'是'}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="是否自营" prop="planningObjectives" min-width="100">
-                  <template slot-scope="scope">
-                    {{scope.row.isSelfOperated == '0'?'否':'是'}}
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </div>
-        </el-tab-pane>
       </el-tabs>
     </div>
     <div>
diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
index f11174b..e29d177 100644
--- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
+++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -38,11 +38,6 @@
             </el-button>
           </div>
         </div>
-        <div style="margin-bottom: 20px;">
-          <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
-            icon="el-icon-circle-plus-outline">新增</el-button>
-          <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
-        </div>
         <!-- 表格 -->
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index dfc0e9b..38d7df8 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -154,7 +154,8 @@
   import resourceCommodity from '../../../components/chakan/map'
   import {
     cereResourceStrategy,
-    editStatus
+    editStatus,
+    cereBusinessOperationadd
   } from '@/api/newly.js'
    import cl from '@/components/change/cl.vue'
   export default {
@@ -217,6 +218,14 @@
             }).then(res => {
               this.onSubmit()
             })
+            cereBusinessOperationadd({
+              type:'发布',
+              resourceId: this.oncetype+this.oninfo.id,
+              operator: localStorage.getItem('roleName'),
+              operationTime: this.gettime()
+            }).then(res => {
+              console.error(res)
+            })
           } else {
             this.$message({
               message: '绑定失败',
@@ -300,6 +309,14 @@
                 message: tit + '成功',
                 type: 'success'
               })
+              cereBusinessOperationadd({
+                type:tit,
+                resourceId: 'sp'+row.id,
+                operator: localStorage.getItem('roleName'),
+                operationTime: that.gettime()
+              }).then(res => {
+                console.error(res)
+              })
               this.removeonaction('1')
             } else {
               this.$message({
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index 2e6d29a..a68b7de 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -13,7 +13,7 @@
             <el-input placeholder="请输入" v-model="formSel.policyName" style="width:168px;margin-right: 15px">
             </el-input>
             <div style="width:68px;height:36px;line-height:32px;">适用资源</div>
-            <el-select v-model="formSel.applicableResources" placeholder="请选择" style="width: 100px;margin-right: 5px">
+            <el-select v-model="formSel.applicableResources" placeholder="请选择" style="width: 168px;margin-right: 15px">
               <el-option label="商铺" value="商铺" />
               <el-option label="场地" value="场地" />
               <el-option label="广告位" value="广告位" />
@@ -22,15 +22,15 @@
             <el-date-picker  style="width:168px;margin-right: 15px" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
               type="datetimerange" range-separator="-" start-placeholder="" end-placeholder=""   prefix-icon="none">
             </el-date-picker> -->
-            <div style="width:68px;height:36px;line-height:32px;">经营类型</div>
-            <el-input placeholder="请输入" v-model="formSel.businessType" style="width:168px;margin-right: 15px" />
+
 
             <div style="width:68px;height:36px;line-height:32px;">是否出租</div>
             <el-select v-model="formSel.isRental" placeholder="请选择" style="width:168px;margin-right: 15px">
               <el-option label="自营" value="0" />
               <el-option label="是" value="1" />
             </el-select>
-
+            <div style="width:68px;height:36px;line-height:32px;">经营类型</div>
+            <el-input placeholder="请输入" v-model="formSel.businessType" style="width:168px;margin-right: 15px" />
 
           </div>
           <div>
@@ -74,7 +74,7 @@
 
           <el-table-column label="操作" min-width="200">
             <template slot-scope="scope">
-              <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
+              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div @click="removeinfo(scope.row)" class="tableBtn greens">编辑</div>
               <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
             </template>
@@ -337,6 +337,10 @@
     },
 
     methods: {
+      details(row) {
+        this.detailsinfo = row
+        this.onaction = '3'
+      },
       removeinfo(row) {
         this.detailsinfo = row
         this.onaction = '4'
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
index 155f829..c022b62 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -7176,7 +7176,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -14219,7 +14219,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -14240,14 +14240,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -14343,7 +14343,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -18651,7 +18651,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json
index e8cfaaf..4575d1b 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json
@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
\ No newline at end of file