diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js
index 41532bb..4bbd9d1 100644
--- a/merchant-web-master/src/utils/request.js
+++ b/merchant-web-master/src/utils/request.js
@@ -20,8 +20,8 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173') {
 }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){
   // 其他情况的默认值
   // PREFIX = 'http://8.130.38.56:8027/business-server';
-   // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
-  PREFIX = 'http://192.168.2.193:9004';
+   PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
+  // PREFIX = 'http://192.168.2.193:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
diff --git a/merchant-web-master/src/views/comprehensive/Lcinquiry/index.vue b/merchant-web-master/src/views/comprehensive/Lcinquiry/index.vue
index e59f480..565a2ec 100644
--- a/merchant-web-master/src/views/comprehensive/Lcinquiry/index.vue
+++ b/merchant-web-master/src/views/comprehensive/Lcinquiry/index.vue
@@ -3,7 +3,7 @@
   <div style="background-color:#F2F3F5">
     <div class="history">
       <div style="background-color:#Fff;padding:20px 20px 0 20px">
-        <div style="font-size:14px;">物资变动查询</div>
+
           <!-- 顶部搜索 -->
           <div class="toolbar">
             <el-form ref="formParams" :inline="true" :model="formParams">
@@ -63,10 +63,10 @@
           </div>
           <!-- 分页 -->
           <div class="fenye">
-            <div style="line-height: 34px">显示第1到第10条记录</div>
+
             <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
-              :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total,sizes,prev, pager,next" :total="total "
-              @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+             layout="total,prev, pager,next" :total="total "
+              @current-change="handleCurrentChange" />
           </div>
        </div>
         </div>
@@ -80,7 +80,7 @@
 export default {
   data() {
     return {
-      total: 1,
+      total: 0,
       pageSize: 10,
       currentPage: 1,
       formParams: {
@@ -91,7 +91,7 @@ export default {
       formInline: {
         searchType: '1',
         search: '', // 搜索字段
-        state: '',
+        state: '3',
         // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
         dates: [], // 下单时间数组
         page: 1,
@@ -111,14 +111,14 @@ const res =  await orderGetAll(this.formInline)
 const Orderlist = await materialChangeInquiry(res.data.list)
 this.tableData = Orderlist.data
 this.total = this.tableData.length
-console.log(Orderlist.data)
+
 },
 async search(){
     this.formInline.dates  =  this.formParams.dates
-
   const res =  await orderGetAll(this.formInline)
   const Orderlist = await materialChangeInquiry(res.data.list)
   this.tableData = Orderlist.data
+  this.total = this.tableData.length
 },
   clear(){
      this.formInline.dates = []
diff --git a/merchant-web-master/src/views/comprehensive/dAddress/index.vue b/merchant-web-master/src/views/comprehensive/dAddress/index.vue
index d79a382..570053d 100644
--- a/merchant-web-master/src/views/comprehensive/dAddress/index.vue
+++ b/merchant-web-master/src/views/comprehensive/dAddress/index.vue
@@ -2,7 +2,6 @@
   <div style="background-color:#F2F3F5">
     <div class="history">
       <div style="background-color:#Fff;padding:20px 20px 0 20px">
-        <div style="font-size:14px;">收货地统计</div>
           <!-- 顶部搜索 -->
           <div class="toolbar">
             <el-form ref="formParams" :inline="true" :model="formParams">
@@ -27,14 +26,11 @@
             </el-form>
           </div>
       </div>
-      <div style="display: flex;margin-bottom: 20px;background-color: #fff;">
-        <div style="border: #EBEEF5 1px solid; margin-right: 20px; width: 45%;" >
-          <div style="border-bottom: #EBEEF5 1px solid;background-color: #F7F7F7;padding: 10px 15px;">收货地地域分布图</div>
-            <div ref="container" style="width: 600px; height: 400px;"></div>
-        </div>
-        <div style="border: #EBEEF5 1px solid; width: 45%;">
-          <div style="border-bottom: #EBEEF5 1px solid;background-color: #F7F7F7;padding: 10px 15px;">收货地占比图</div>
-          <div ref="container1" style="width: 600px; height: 400px;"></div>
+      <div style="margin-bottom: 20px;background-color: #fff;">
+
+        <div style="border: #EBEEF5 1px solid;width: 100%;">
+          <div style="border-bottom: #EBEEF5 1px solid;background-color: #F7F7F7;padding: 10px 15px;">收货地成交图</div>
+          <div ref="container1" style="width: 80%; height: 400px;"></div>
         </div>
       </div>
         <!-- 表格 -->
@@ -87,7 +83,7 @@
   export default {
   data() {
     return {
-      total: 1,
+      total: 0,
       flag:false,
       pageSize: 10,
       currentPage: 1,
@@ -120,16 +116,17 @@
      const res =  await orderGetAll(this.formInline)
      const Orderlist = await deliveryAddressStatistics(res.data.list)
      this.tableData = Orderlist.data
-     this.total = this.tableData.length
-    this.echar1()
+     this.total = Orderlist.data.length
+    this.echar1(Orderlist.data)
 
      },
 async search(){
     this.formInline.dates  =  this.formParams.dates
-
   const res =  await orderGetAll(this.formInline)
   const Orderlist = await deliveryAddressStatistics(res.data.list)
   this.tableData = Orderlist.data
+  this.total = Orderlist.data.length
+  this.echar1(Orderlist.data)
 },
   clear(){
      this.formInline.dates = []
@@ -142,6 +139,10 @@ async search(){
      echar1(diameter) {
        let Dom = this.$refs.container1
        let myChart = echarts.init(Dom);
+       let processedData = diameter.map(item => ({
+         name: item.address,
+         value: item.refundAmount
+       }))
        // 指定图表的配置项和数据
       const option = {
 
@@ -179,13 +180,7 @@ async search(){
                  fontSize: 20
                }
              },
-             data: [
-               { value: 60, name: 'Visit' },
-               { value: 40, name: 'Inquiry' },
-               { value: 20, name: 'Order' },
-               { value: 80, name: 'Click' },
-               { value: 100, name: 'Show' }
-             ]
+             data: processedData
            }
          ]
        };
diff --git a/merchant-web-master/src/views/comprehensive/pEranking/index.vue b/merchant-web-master/src/views/comprehensive/pEranking/index.vue
index 2cdcfca..f22a2fd 100644
--- a/merchant-web-master/src/views/comprehensive/pEranking/index.vue
+++ b/merchant-web-master/src/views/comprehensive/pEranking/index.vue
@@ -3,7 +3,7 @@
   <div style="background-color:#F2F3F5">
     <div class="history">
       <div style="background-color:#Fff;padding:20px 20px 0 20px">
-        <div style="font-size:14px;">商品入库统计</div>
+
           <!-- 顶部搜索 -->
           <div class="toolbar">
             <el-form ref="formParams" :inline="true" :model="formParams">
@@ -51,16 +51,8 @@
                                   {{scope.row.cereShopComments[0].shopName}}
                                   </template>
                             </el-table-column>
-              <el-table-column prop="fl" label="商品分类">
-              <template slot-scope="scope">
-                                  <!-- {{scope.row.cereShopComments[0].shopGroupName}} -->
-                                  </template>
-                                   </el-table-column>
-              <el-table-column prop="sx" label="属性" >
-                <template slot-scope="scope">
-                                    <!-- {{scope.row.cereShopComments[0].value}} -->
-                                    </template>
-                                     </el-table-column>
+
+
               <el-table-column prop="ctime" label="商品创建时间" >
                 <template slot-scope="scope">
                                     {{scope.row.cereShopComments[0].createTime}}
@@ -80,10 +72,10 @@
           </div>
           <!-- 分页 -->
           <div class="fenye">
-            <div style="line-height: 34px">显示第1到第10条记录</div>
+
             <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
-              :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total,sizes,prev, pager,next" :total="total "
-              @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+             layout="total,prev, pager,next" :total="total"
+               @current-change="handleCurrentChange" />
           </div>
        </div>
         </div>
@@ -97,7 +89,7 @@
 export default {
   data() {
     return {
-      total: 1,
+      total: 0,
       pageSize: 10,
       currentPage: 1,
       formParams: {
@@ -155,11 +147,33 @@ export default {
 
       return dateString;
     },
+    // 获取时间
+        currentTime() {
+            let date = new Date();
+            let year = date.getFullYear();
+            let month = date.getMonth() + 1; // 月份从0~11，所以加一
+            let day = date.getDate();
+            let hours = date.getHours();
+            let minutes = date.getMinutes();
+            let seconds = date.getSeconds();
+
+            // 为月、日、时、分、秒添加前导零（如果需要）
+            month = month < 10 ? '0' + month : month;
+            day = day < 10 ? '0' + day : day;
+            hours = hours < 10 ? '0' + hours : hours;
+            minutes = minutes < 10 ? '0' + minutes : minutes;
+            seconds = seconds < 10 ? '0' + seconds : seconds;
+
+            // 拼接日期和时间字符串
+            let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+            return strDate;
+        },
 async getAll(){
  let last =  this.updateCurrentTime()
 // const res =  await orderGetAll(this.formInline)
-const Orderlist = await productEvaluationRanking({startTime:last[0],endTime:last[1]})
-this.tableData = Orderlist.data.list
+const Orderlist = await productEvaluationRanking({startTime:'2020-1-1 59:59:59',endTime:this.currentTime()})
+this.tableData = Orderlist.data
+this.total = Orderlist.data.length
 },
 async search(){
   this.formInline.dates = this.formParams.dates
@@ -168,7 +182,7 @@ async search(){
   let endTimeS = this.formInline.dates[1] +` 23:59:59`
   const Orderlist = await productEvaluationRanking({startTime:startTimeS,endTime:endTimeS})
   this.tableData = Orderlist.data
-  console.log(Orderlist.data)
+  this.total = Orderlist.data.length
 },
 clear(){
   this.formInline.dates = []
diff --git a/merchant-web-master/src/views/comprehensive/pcdetails/index.vue b/merchant-web-master/src/views/comprehensive/pcdetails/index.vue
index a8d80d6..f34c58f 100644
--- a/merchant-web-master/src/views/comprehensive/pcdetails/index.vue
+++ b/merchant-web-master/src/views/comprehensive/pcdetails/index.vue
@@ -3,7 +3,7 @@
   <div style="background-color:#fff">
     <div class="history">
       <div style="background-color:#Fff;padding:20px 20px 0 20px;display:flex;justify-content: space-between;">
-        <div style="font-size:14px;line-height:200%">商品消费明细</div>
+
           <!-- 顶部搜索 -->
           <div class="toolbar">
             <el-form ref="formParams" :inline="true" :model="formParams">
@@ -45,8 +45,8 @@
       <div style="background-color:#fff;padding: 20px 20px 0px;">
          <div style="background-color:#F2F3F5;padding: 5px;">
            <div style="background-color:#fff;padding:15px">商品消费排行榜</div>
-           <div style="display:flex;">
-               <div style="width:80%;height:250px;background-color:#fff;" ref="myEchartsThree" ></div>
+           <div style="display:flex; ">
+               <div style="width:100%;height:250px;background-color:#fff;padding: 0 20px;" ref="myEchartsThree" ></div>
                <!-- <div style="width:100%;height:250px;background-color:#fff;"></div> -->
            </div>
          </div>
@@ -80,10 +80,10 @@
               </el-table>
             </div>
             <div class="fenye">
-              <div style="line-height: 34px">显示第1到第10条记录</div>
+
               <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
-                :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total,sizes,prev, pager,next" :total="total "
-                @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+                layout="total,prev, pager,next" :total="total"
+                @current-change="handleCurrentChange" />
             </div>
           </div>
           <!-- 分页 -->
@@ -104,7 +104,7 @@ export default {
   data() {
     return {
       list: [],
-      total: 1,
+      total: 0,
       pageSize: 10,
       currentPage: 1,
       formParams: {
@@ -175,7 +175,7 @@ this.drawsTwo(zhutu.data)
         this.yuantu.rates.push(remai.data.hotSellProducts[i].number)
  }
 
- this.draws(this.yuantu)
+
  for(let i =0;i<Orderlist.data.length;i++){
 
    let item = {}
@@ -185,6 +185,7 @@ this.drawsTwo(zhutu.data)
       // this.bing[i].value = Orderlist.data[i].bigDecimal
       // this.bing[i].name = Orderlist.data[i].product.productName
  }
+ this.draws(this.bing)
  this.draw(this.bing)
 
     },
@@ -192,6 +193,7 @@ this.drawsTwo(zhutu.data)
    this.formInline.dates = this.formParams.dates
   const res =  await orderGetAll(this.formInline)
  this.tableData =  res.data.list
+ this.total = this.tableData.length
   const Orderlist = await salesRanking(res.data.list)
    const zhutu  =  await commodityConsumption(res.data.list)
    const remai = await dashIndex(this.form)
@@ -202,11 +204,12 @@ this.drawsTwo(zhutu.data)
         this.yuantu.rates.push(remai.data.hotSellProducts[i].number)
  }
 
- this.draws(this.yuantu)
+
  for(let i =0;i<Orderlist.data.length;i++){
       this.bing[i].value = Orderlist.data[i].bigDecimal
       this.bing[i].name = Orderlist.data[i].product.productName
  }
+ this.draws(this.bing)
  this.draw(this.bing)
  },
     handleCurrentChange(val) {
@@ -277,17 +280,14 @@ this.drawsTwo(zhutu.data)
       myEchart.setOption(option)
     },
     draws(arr) {
-      let lo = {
-        "names": this.yuantu.names,
-        "rates": this.yuantu.rates
-      }
+      console.log(arr)
       const myEchart = echarts.init(this.$refs.myEchartsThree, 'light')
       // const o = this.chartData
       const option = {
         // color: ["#74d1fd", "#009ae4", "#0071c1"],
         // 设置图表的位置
         grid: {
-          x: 110, // 左间距
+          x: 200, // 左间距
           y: 0, // 上间距
           x2: 60, // 右间距
           y2: 40 // 下间距
@@ -305,7 +305,7 @@ this.drawsTwo(zhutu.data)
           },
           // 提示框浮层内容格式器，支持字符串模板和回调函数两种形式 折线（区域）图、柱状（条形）图、K线图
           // {a}（系列名称），{b}（类目值），{c}（数值）, {d}（无）
-          formatter: '{b}<br />{a0}: {c0}'
+          formatter: '{b}<br />{a0}: {c0}%'
         },
         // // 图例组件
         // legend: {
@@ -364,29 +364,31 @@ this.drawsTwo(zhutu.data)
             // 坐标轴刻度标签
             axisLabel: {
               show: true, // 是否显示刻度标签 默认显示
-              fontSize: 14, // 文字的字体大小
+              fontSize: 16, // 文字的字体大小
               color: '#cdd3ee', // 刻度标签文字的颜色
               // 使用字符串模板，模板变量为刻度默认标签 {value}
               formatter: '{value}'
             },
             // 类目数据，在类目轴（type: 'category'）中有效
-            data: lo.names.reverse()
+            data: arr.map(item => item.name)
           }
         ],
         // 系列列表
-        series: [{
-          type: 'bar', // 系列类型
-          name: '已消费',
-          barMaxWidth: 20, // 柱条的最大宽度，不设时自适应
-          // label: {
-          //   show: true,
-          //   position: "inside"
-          // },
-          itemStyle: {
-            barBorderRadius: [10, 0, 0, 10] // 圆角半径, 单位px, 支持传入数组分别指定 4 个圆角半径
-          },
-          data: lo.rates.reverse() // 系列中的数据内容数组
-        }]
+        series: [
+          {
+            type: 'bar', // 系列类型
+            name: '已完成',
+            barMaxWidth: 20, // 柱条的最大宽度，不设时自适应
+            // label: {
+            //   show: true,
+            //   position: "inside"
+            // },
+            itemStyle: {
+              barBorderRadius: [10, 0, 0, 10] // 圆角半径, 单位px, 支持传入数组分别指定 4 个圆角半径
+            },
+            data:arr.map(item => item.value)// 系列中的数据内容数组
+          }
+        ]
       }
 
       myEchart.setOption(option)
diff --git a/merchant-web-master/src/views/comprehensive/psRanking/index.vue b/merchant-web-master/src/views/comprehensive/psRanking/index.vue
index 2a5b1f6..aaabab6 100644
--- a/merchant-web-master/src/views/comprehensive/psRanking/index.vue
+++ b/merchant-web-master/src/views/comprehensive/psRanking/index.vue
@@ -3,7 +3,7 @@
   <div style="background-color:#F2F3F5">
     <div class="history">
       <div style="background-color:#Fff;padding:20px 20px 0 20px">
-        <div style="font-size:14px;">商品销售排行</div>
+
           <!-- 顶部搜索 -->
           <div class="toolbar">
             <el-form ref="formParams" :inline="true" :model="formParams">
@@ -56,9 +56,9 @@
                                   {{scope.row.product.shopGroupName}}
                                   </template>
                                    </el-table-column>
-              <el-table-column prop="sx" label="属性" >
+              <el-table-column prop="sx" label="属性" show-overflow-tooltip>
                 <template slot-scope="scope">
-                                    {{scope.row.products[0].value}}
+                                    {{scope.row.product.productBrief}}
                                     </template>
                                      </el-table-column>
               <el-table-column prop="createTime" label="商品创建时间">
@@ -72,10 +72,10 @@
           </div>
           <!-- 分页 -->
           <div class="fenye">
-            <div style="line-height: 34px">显示第1到第10条记录</div>
+
             <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
-              :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total,sizes,prev, pager,next" :total="total "
-              @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+             layout="total,prev, pager,next" :total="total "
+              @current-change="handleCurrentChange" />
           </div>
        </div>
         </div>
@@ -90,7 +90,7 @@
 export default {
   data() {
     return {
-      total: 1,
+      total: 0,
       pageSize: 10,
       currentPage: 1,
       formParams: {
@@ -123,14 +123,14 @@ async getAll(){
 const res =  await orderGetAll(this.formInline)
 const Orderlist = await salesRanking(res.data.list)
 this.tableData = Orderlist.data
-
+this.total = Orderlist.data.length
 },
 async search(){
   this.formInline.dates = this.formParams.dates
   const res =  await orderGetAll(this.formInline)
   const Orderlist = await salesRanking(res.data.list)
   this.tableData = Orderlist.data
-  console.log(Orderlist.data)
+  this.total = Orderlist.data.length
 },
 clear(){
   this.formParams.dates =[]
diff --git a/merchant-web-master/src/views/stockControl/inventory/index.vue b/merchant-web-master/src/views/stockControl/inventory/index.vue
index 3c5999a..e975f78 100644
--- a/merchant-web-master/src/views/stockControl/inventory/index.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/index.vue
@@ -83,6 +83,12 @@
             </template>
           </el-table-column>
           <el-table-column prop="reject" label="驳回原因" show-overflow-tooltip />
+          <el-table-column prop="registrationStatus" label="登记状态" show-overflow-tooltip>
+            <template slot-scope="scope">
+                <span v-if="scope.row.registrationStatus==''">未入库</span>
+                <span v-if="scope.row.registrationStatus==1">已入库</span>
+              </template>
+            </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="180" />
           <el-table-column label="操作" width="200">
             <template slot-scope="scope">
@@ -91,6 +97,7 @@
                 <div v-if="scope.row.shelveState==0" class="tableBtn greens" @click="down(scope.row)">上架</div>
                 <div v-if="scope.row.shelveState==1" class="tableBtn greens" @click="down(scope.row)">下架</div>
                 <div v-if="scope.row.combinationId != '' && scope.row.stockNumber != 0" class="tableBtn greens" @click="chaiFen(scope.row)" >拆分</div>
+                <div @click="setVipPrice(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens" >设置会员价</div>
                 <div v-if="scope.row.shelveState!=1" class="tableBtn greens" @click="del(scope.row)">删除</div>
               </div>
             </template>
@@ -146,6 +153,78 @@
         :message="parentMessage"
       />
     </el-dialog>
+    <!-- 设置会员价弹窗 -->
+    <el-dialog
+      title="设置会员价"
+      :visible.sync="vipPriceVisible"
+      width="50%"
+      class="vipDialog"
+    >
+      <el-form ref="form" label-width="80px">
+        <el-form-item label="优惠方式">
+          <el-radio-group v-model="mode" @change="modeChange">
+            <el-radio :label="1">折扣</el-radio>
+            <el-radio :label="2">指定价格</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <div class="priceTable">
+          <table>
+            <tr>
+              <th>规格</th>
+              <th>售价</th>
+              <th v-for="(item,index) in gradeList" :key="index">
+                {{ item }}
+              </th>
+            </tr>
+            <tr v-for="(item,index) in productData" :key="index">
+              <td>
+                {{ item.value }}
+              </td>
+              <td>
+                {{ item.price }}
+              </td>
+              <td v-for="(itemJ,indexJ) in item.memberPrices" :key="indexJ" class="td-input">
+                <el-input v-model="itemJ.price" oninput="value=value.replace(/([^\d|\.])/g, '')" /> {{ mode==1?'折':'元' }}
+              </td>
+            </tr>
+          </table>
+        </div>
+        <el-button type="success" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="vipPriceVisible = false">取 消</el-button>
+        <el-button type="primary" @click="vipPriceSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="入库登记"
+      :visible.sync="rukuShow"
+      width="60%"
+      class="vipDialog"
+    >
+    <el-form ref="form" label-width="80px">
+      <el-form-item label="商品名称">
+  <el-select v-model="shopId" filterable placeholder="请选择">
+    <el-option
+      v-for="item in tableData"
+      :key="item.productId"
+      :label="item.productName"
+      :value="item.productId">
+    </el-option>
+  </el-select>
+      </el-form-item>
+      <el-form-item label="是否登记">
+        <el-radio-group v-model="dengjiMsg" >
+          <el-radio label="1">是</el-radio>
+          <el-radio label="">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="rukuShow = false">取 消</el-button>
+        <el-button type="primary" @click="rukuCheck">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -164,7 +243,8 @@ import {
   setProductMember,
   productExport,
   getBrandList,
-  chFen
+  chFen,
+  getClassifyUpdate
 } from '@/api/commodity'
 export default {
   components: {
@@ -197,11 +277,19 @@ export default {
       commId: 0,
       brandList: [],
       zuheNum:0,
-      teble_sel:false,
+
       parentMessage: '这是父组件传递给子组件的消息',
       canst:'' ,//组合商品ID
       index:1,
-      dengji:[]
+      dengji:[],
+      vipPriceVisible: false,
+      mode: 1,
+      productData: [],
+      gradeList: [],
+      teble_sel:false,
+      rukuShow:false,
+      dengjiMsg:'',
+      shopId:''
     }
   },
   computed: {
@@ -454,8 +542,95 @@ export default {
           },
           //入库登记
           rukdengji(){
-            this.teble_sel = true
-            this.index = 1
+            this.rukuShow = true
+
+          },
+          // 设置会员价
+          setVipPrice(row) {
+            var _ = this
+            this.productId = row.productId
+            getProductMembers({ productId: row.productId }).then(res => {
+              if (res.code === '') {
+                _.productData = res.data
+                if (_.productData && _.productData.length > 0) {
+                  _.gradeList = []
+                  const _memberPrices = _.productData[0].memberPrices
+                  _memberPrices.forEach(function(item, i) {
+                    _.gradeList.push(item.memberLevelName)
+                  })
+                  _.mode = _.productData[0].mode ? _.productData[0].mode : 1
+                  _.vipPriceVisible = true
+                }
+              }
+            })
+          },
+          // 设置会员价提交
+          vipPriceSubmit() {
+            for (let i = 0; i < this.productData.length; i++) {
+              this.productData[i].mode = this.mode
+              for (let j = 0; j < this.productData[i].memberPrices.length; j++) {
+                this.productData[i].memberPrices[j].mode = this.mode
+                var _price = this.productData[i].memberPrices[j].price
+                if (!_price) {
+                  this.$message({
+                    type: 'warning',
+                    message: '会员价格不能为空！'
+                  })
+                  return false
+                } else if (this.productData[i].mode === 1) {
+                  if (_price <= 0 || _price >= 10) {
+                    this.$message({
+                      type: 'warning',
+                      message: '会员折数必须大于0小于10！'
+                    })
+                    return false
+                  }
+                } else if (this.productData[i].mode === 2) {
+                  if (_price > this.productData[i].price) {
+                    this.$message({
+                      type: 'warning',
+                      message: '会员价格不能大于原价！'
+                    })
+                    return false
+                  }
+                }
+              }
+            }
+            setProductMember({ productId: this.productId, members: this.productData }).then(res => {
+              if (res.code === '') {
+                this.$message({
+                  type: 'success',
+                  message: '设置成功!'
+                })
+                this.getAll(this.formInline)
+                this.vipPriceVisible = false
+              }
+            })
+          },
+          // 清空会员价
+          clearProductMember() {
+            console.log(this.productData, 'this.productData')
+            this.$confirm('该商品所有旧设置的会员价将被清除, 是否继续？', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              clearProductMember({ productId: this.productId }).then(res => {
+                if (res.code === '') {
+                  this.productData.map(item => {
+                    item.memberPrices.map(itemChild => {
+                      itemChild.price = null
+                    })
+                  })
+                  this.$message.success('清除成功')
+                  // this.vipPriceVisible = false
+                }
+              })
+            })
+          },
+        async  rukuCheck(){
+            await getClassifyUpdate({productId:this.shopId,registrationStatus:this.dengjiMsg})
+            this.$message.success('保存成功')
           }
   }
 }
diff --git a/yanshouban/src/utils/request.js b/yanshouban/src/utils/request.js
index 95cd009..3bffb11 100644
--- a/yanshouban/src/utils/request.js
+++ b/yanshouban/src/utils/request.js
@@ -21,9 +21,9 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173' || host =='172.16.61.1
  // PREFIX = 'http://172.16.61.48/meserver/admin-server';
   // PREFIX = 'http://8.130.38.56:9003';
   // PREFIX = 'http://8.130.38.56:8019/admin-server';
- PREFIX = 'http://192.168.2.193:9003';
+ // PREFIX = 'http://192.168.2.193:9003';
  // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
-   // PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
+   PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
    // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
     // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'
 
diff --git a/yanshouban/src/views/ads/fangAudit/bianform.vue b/yanshouban/src/views/ads/fangAudit/bianform.vue
index c986db1..59923f5 100644
--- a/yanshouban/src/views/ads/fangAudit/bianform.vue
+++ b/yanshouban/src/views/ads/fangAudit/bianform.vue
@@ -66,7 +66,7 @@
           </div>
         </div>
             <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
-              <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="steat == false && ruleForm.attachmentInfo">{{ruleForm.attachmentInfo.name}}</div>
+              <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"   v-if="ruleForm.attachmentInfo" :href="ruleForm.attachmentInfo.url" target="_blank" download>{{ruleForm.attachmentInfo.name}}</a>
               <!-- <a style="margin-left:20px;color:#3F9B6A" :href="ruleForm.attachmentInfo.url" target="_blank" v-if="ruleForm.attachmentInfo.name">下载</a> -->
   <!-- <el-upload class="upload-demo" ref="upload" :on-preview="handlePreview" :on-remove="handleRemove"
                     :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
@@ -191,13 +191,14 @@ guihuaDate:[],
     watch: {
           'list': {
               handler(newValue) {
+
                 // 当 list 发生变化时，更新 secondData
                 this.ruleForm = { ...newValue };
-                console.log(this.ruleForm)
-            if ( this.ruleForm.attachmentInfo != '') {
-                // this.ruleForm.attachmentInfo = JSON.parse(this.ruleForm.attachmentInfo)
-                this.fileData.push(this.ruleForm.attachmentInfo)
-            }
+
+           if ( this.ruleForm.attachmentInfo != '' && typeof this.ruleForm.attachmentInfo === 'string') {
+               this.ruleForm.attachmentInfo = JSON.parse(this.ruleForm.attachmentInfo)
+
+           }
             // if(this.ruleForm.resourceManagement !=''){
             //   this.ruleForm.resourceManagement = JSON.parse(this.ruleForm.resourceManagement)
             // }
diff --git a/yanshouban/src/views/ads/fangAudit/index.vue b/yanshouban/src/views/ads/fangAudit/index.vue
index a5c2af7..fe24324 100644
--- a/yanshouban/src/views/ads/fangAudit/index.vue
+++ b/yanshouban/src/views/ads/fangAudit/index.vue
@@ -524,7 +524,8 @@
            </div>
                <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
 
-    <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="shenhe.attachmentInfo &&shenhe.attachmentInfo.name">{{shenhe.attachmentInfo.name}}</div>
+
+    <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"   v-if="shenhe.attachmentInfo" :href="shenhe.attachmentInfo.url" target="_blank" download>{{shenhe.attachmentInfo.name}}</a>
 
                </el-form-item>
 
@@ -598,7 +599,7 @@ export default {
       pageindex: {
         pageNumber: 1,
         pageSize: 10,
-        auditStatus:'1'
+
       },
       chart: null,
       chart1: null,
diff --git a/yanshouban/src/views/ads/fangli/addform.vue b/yanshouban/src/views/ads/fangli/addform.vue
index 1b9caf0..09d0602 100644
--- a/yanshouban/src/views/ads/fangli/addform.vue
+++ b/yanshouban/src/views/ads/fangli/addform.vue
@@ -254,7 +254,7 @@
       </div>
     </el-dialog>
     <!-- 模板管理 -->
-    <el-dialog title="模板管理" :visible.sync="ModeShow" custom-class='bian_css' style="padding: 0;" width="65%"
+    <!-- <el-dialog title="模板管理" :visible.sync="ModeShow" custom-class='bian_css' style="padding: 0;" width="65%"
       center :close-on-click-modal="false"  append-to-body>
       <div style="padding:20px;">
         <div>
@@ -274,7 +274,7 @@
                     <template slot-scope="scope">
                       <div @click="modeXian(scope.row)" class="tableBtn greens">选择模板</div>
                       <div @click="modeXian(scope.row)" class="tableBtn greens">查看</div>
-                      <!-- <div @click="addM(2,scope.row)" class="tableBtn greens">编辑</div> -->
+
                       <div @click="" class="tableBtn greens">删除</div>
                     </template>
                   </el-table-column>
@@ -354,7 +354,7 @@
                 </div>
 
               </el-dialog>
-    </el-dialog>
+    </el-dialog> -->
 
      </div>
 
@@ -506,10 +506,11 @@ multipleSelection:[],
 
         const fileMsg = {
           name:file.name,
-           url:response.data,
+           url:response.data.url,
         }
         // 将文件地址存储在 uploadedFiles 数组中
-        this.fileData.push(fileMsg);
+        this.fileData.push(fileMsg)
+
       },
       handleRemove(file, fileList) {
         this.fileData = []
diff --git a/yanshouban/src/views/ads/fangli/bianform.vue b/yanshouban/src/views/ads/fangli/bianform.vue
index be63e81..a6b504b 100644
--- a/yanshouban/src/views/ads/fangli/bianform.vue
+++ b/yanshouban/src/views/ads/fangli/bianform.vue
@@ -79,10 +79,9 @@
                     :auto-upload="true" v-if="steat">
                     <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover" v-if="fileData.length ==0">+点击上传</el-button>
                   </el-upload>
-<!-- <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"   v-if="steat == false && ruleForm.attachmentInfo" :href="secondData.annex.response.data.url" target="_blank" download>{{secondData.annex.name}}</a> -->
 
-                  <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="steat == false && ruleForm.attachmentInfo">{{ruleForm.attachmentInfo.name}}</div>
-                  <!-- <a style="margin-left:20px;color:#3F9B6A" :href="ruleForm.attachmentInfo.url" target="_blank" v-if="ruleForm.attachmentInfo.name">下载</a> -->
+<a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"   v-if="steat == false && ruleForm.attachmentInfo" :href="ruleForm.attachmentInfo.url" target="_blank" download>{{ruleForm.attachmentInfo.name}}</a>
+
             </el-form-item>
          </el-form>
         <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
@@ -363,7 +362,7 @@ guihuaDate:[],
 
       const fileMsg = {
        name:file.name,
-        url: response.data,
+        url: response.data.url,
      }
       // 将文件地址存储在 uploadedFiles 数组中
       this.fileData.push(fileMsg);
diff --git a/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue b/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue
index c7f2335..e2bbbc9 100644
--- a/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue
+++ b/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -57,8 +57,7 @@
               {{scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column label="编号" min-width="150" prop="id">
-          </el-table-column>
+
           <el-table-column label="所属端" min-width="150"  v-if="leixing == 1">
             <template slot-scope="scope">
             {{scope.row.cereAdvertisingInformation.affiliation}}
@@ -84,11 +83,8 @@
 
 
           </el-table-column>
-          <el-table-column label="投放定价" prop="tenant" min-width="150">
-            <template slot-scope="scope">
-              {{scope.row.rotationOrde}}
+          <el-table-column label="投放定价" prop="cpc" min-width="150">
 
-            </template>
           </el-table-column>
 
 
@@ -672,28 +668,27 @@
                                       <template slot="label">
                                         合同签订日期
                                       </template>
-                                      <el-input
-                                        v-model="heForm.contractSigningDate"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
+
+                                        <el-date-picker  v-model="heForm.contractSigningDate"
+                                          value-format="yyyy-MM-dd"    type="date"   placeholder="请选择" prefix-icon="none" style="border:none">
+                                        </el-date-picker>
                                     </el-descriptions-item>
                                     <el-descriptions-item>
                                       <template slot="label">
                                         合同终止日期
                                       </template>
-                                      <el-input
-                                        v-model="heForm.contractTerminationDate"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
+
+                                        <el-date-picker  v-model="heForm.contractTerminationDate"
+                                          value-format="yyyy-MM-dd"    type="date"   placeholder="请选择" prefix-icon="none" style="border:none">
+                                        </el-date-picker>
                                     </el-descriptions-item>
                                     <el-descriptions-item>
                                       <template slot="label">
                                         起止日期
                                       </template>
-                                      <el-input
-                                        v-model="heForm.leaseStartDate"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
+                                        <el-date-picker  v-model="heForm.leaseStartDate"
+                                          value-format="yyyy-MM-dd"    type="date"   placeholder="请选择" prefix-icon="none" style="border:none">
+                                        </el-date-picker>
                                     </el-descriptions-item>
                                     <el-descriptions-item>
                                       <template slot="label">
@@ -925,7 +920,8 @@
           auditReminderTime:'',
         },
         peiShow:false,
-        peiId:''
+        peiId:'',
+        hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount','tenantName','tenantTelephone','tenantBankAccount'],
       }
     },
     created() {
@@ -1223,7 +1219,8 @@ heCheck(){
     if(this.hetongData.length !=0){
        this.heForm.appendicesContract = JSON.stringify(this.hetongData[0])
     }
-  hetongadd(this.heForm).then(res=>{
+    let heinfo =  this.$decryptall(this.heForm,this.hemiList)
+  hetongadd(heinfo).then(res=>{
     AdvertiserInfoEdit({
       id: this.secondData.id,
       contractId:res.data.id,
diff --git a/yanshouban/src/views/advertisement/index.vue b/yanshouban/src/views/advertisement/index.vue
index 14f30d9..0787dbc 100644
--- a/yanshouban/src/views/advertisement/index.vue
+++ b/yanshouban/src/views/advertisement/index.vue
@@ -91,7 +91,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" min-width="350">
+          <el-table-column label="操作" min-width="350" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div @click="lookHetong(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus !='5'">合同编辑</div>
@@ -102,7 +102,7 @@
               <div class="tableBtn greens" v-if="scope.row.auditStatus =='1'"  @click="peizhi(scope.row)">
                 审核流程配置
               </div>
-              <div @click="gengGai(scope.row)" class="tableBtn greens" v-if="leixing == 1&& scope.row.auditStatus !='5'">更改状态</div>
+              <div @click="gengGai(scope.row)" class="tableBtn greens" v-if="leixing == 2&& scope.row.auditStatus !='5'">更改状态</div>
               <div @click="handleDelete(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='1'">删除</div>
               <!-- <div @click="handleDelete(scope.row)" class="tableBtn greens" >删除</div> -->
             </template>
@@ -1090,13 +1090,23 @@
      if (contentLength > 0) {
        // 获取最后一个元素并赋值给 this.hetong
        this.hetong = res.data.content[contentLength - 1]
+        this.hetong.bankAccount =this.$decrypt(this.hetong.bankAccount)
+        this.hetong.contractAmount =this.$decrypt(this.hetong.contractAmount)
+        this.hetong.dataIntegrity =this.$decrypt(this.hetong.dataIntegrity)
+        this.hetong.earnestMoney =this.$decrypt(this.hetong.earnestMoney)
+        this.hetong.lessorName =this.$decrypt(this.hetong.lessorName)
+        this.hetong.telephone =this.$decrypt(this.hetong.telephone)
+        this.hetong.tenantName =this.$decrypt(this.hetong.tenantName)
+
      }
        this.hetongBox = true
+       console.log(this.hetong)
       },
       //编辑合同
      async EditHetong(val){
        this.hetong.updateDate  = ''
-       await hetongEdit(this.hetong)
+       let heinfo =  this.$decryptall(this.hetong,this.hemiList)
+       await hetongEdit(heinfo)
        this.hetongBox = false
       this.getTable(this.chengeTatle)
       },
@@ -1110,13 +1120,25 @@
              this.formSel.online = '实体广告位'
              this.pageindex.scopeDeployment= '实体广告位'
           }
-          contractGetAll(this.formSel).then(res=>{
+            let obj =  JSON.parse(JSON.stringify(this.formSel))
+        obj.cereContractInformation.tenantName= this.$encrypt(obj.cereContractInformation.tenantName)
+          contractGetAll(obj).then(res=>{
             if(this.pageindex.scopeDeployment == '线上广告位'){
               this.xsNum = res.data.content.length
             }else{
               this.stNum = res.data.content.length
             }
             this.tableData = res.data.content
+            this.tableData.map(res=>{
+                   res.cereContractInformation.earnestMoney =this.$decrypt(res.cereContractInformation.earnestMoney)
+                   res.cereContractInformation.contractAmount =this.$decrypt(res.cereContractInformation.contractAmount)
+                   res.cereContractInformation.lessorName =this.$decrypt(res.cereContractInformation.lessorName)
+                   res.cereContractInformation.telephone =this.$decrypt(res.cereContractInformation.telephone)
+                   res.cereContractInformation.bankAccount =this.$decrypt(res.cereContractInformation.bankAccount)
+                   res.cereContractInformation.tenantName =this.$decrypt(res.cereContractInformation.tenantName)
+                   res.cereContractInformation.tenantTelephone =this.$decrypt(res.cereContractInformation.tenantTelephone)
+                   res.cereContractInformation.tenantBankAccount =this.$decrypt(res.cereContractInformation.tenantBankAccount)
+                 })
             this.total = res.data.content.length
           })
           // const res = await contractGetAll(this.pageindex)
@@ -1193,13 +1215,62 @@
       childFujian(msg){
           this.fileData = msg
       },
-     async toufang(item){
-         await updateList({id:item.id,auditStatus:'4'})
-         this.getAll()
+      toufang(item){
+
+              const h = this.$createElement;
+                      this.$msgbox({
+                        title: '消息',
+                        message: h('p', null, [
+                          h('span', null, '是否投放 '),
+                        ]),
+                        showCancelButton: true,
+                        showClose:false,
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        customClass:'oe-dialog-btn',
+                        beforeClose: (action, instance, done) => {
+                          if (action === 'confirm') {
+                            updateList({id:item.id,auditStatus:'4'}).then(res=>{
+                               this.getAll()
+                              done();
+                            })
+
+                          } else {
+                            done();
+                          }
+            }
+            })
+
+
+
       },
-     async xiajia(item){
-        await updateList({id:item.id,auditStatus:'2'})
-        this.getAll()
+      xiajia(item){
+               const h = this.$createElement;
+                       this.$msgbox({
+                         title: '消息',
+                         message: h('p', null, [
+                           h('span', null, '是否下架 '),
+                         ]),
+                         showCancelButton: true,
+                         showClose:false,
+                         confirmButtonText: '确定',
+                         cancelButtonText: '取消',
+                         customClass:'oe-dialog-btn',
+                         beforeClose: (action, instance, done) => {
+                           if (action === 'confirm') {
+                             updateList({id:item.id,auditStatus:'2'}).then(res=>{
+                                this.getAll()
+                               done();
+                             })
+
+                           } else {
+                             done();
+                           }
+             }
+             })
+
+
+
       },
      async status(){
         await updateList({id:this.secondData.id,auditStatus:'5'})
diff --git a/yanshouban/src/views/customer/rsaManagement/index.vue b/yanshouban/src/views/customer/rsaManagement/index.vue
index df823b8..909834a 100644
--- a/yanshouban/src/views/customer/rsaManagement/index.vue
+++ b/yanshouban/src/views/customer/rsaManagement/index.vue
@@ -326,7 +326,7 @@
             ">
            匹配记录
           </div>
-          <div style="padding: 0 20px">
+          <div style="padding: 0 20px;" >
             <div style="
                 display: flex;
                 justify-content: space-between;
@@ -336,9 +336,9 @@
               <el-form ref="form"  :inline="true" :model="pipeiSel" style="padding-top: 10px;">
                 <el-form-item label="意向资源类型">
                   <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择"  style="width:168px">
-                    <el-option label="商铺" value="sp" />
-                    <el-option label="广告位" value="gg" />
-                    <el-option label="场地" value="cd" />
+                    <el-option label="商铺" value="商铺" />
+                    <el-option label="广告位" value="广告位" />
+                    <el-option label="场地" value="场地" />
                   </el-select>
 
                 </el-form-item>
@@ -371,29 +371,37 @@
               <el-button style="background-color: #3F9B6A;color: #fff"
               >导出</el-button>
             </div> -->
-            <el-table :data="
-                pipData.slice(
-                  (currentPage - 1) * pageSize,
-                  currentPage * pageSize
-                )
-              " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+            <el-table :data="pipData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" style="max-height:500px;overflow: auto;">
               <el-table-column label="序号" min-width="80">
                 <template slot-scope="scope">
                   {{scope.$index+1}}
                 </template>
               </el-table-column>
-              <el-table-column label="资源名称" prop="intentCustomerName" min-width="150" />
+              <!-- <el-table-column label="资源名称" prop="intentCustomerName" min-width="150" /> -->
               <el-table-column label="编号" prop="resourcesId" min-width="150" />
-              <el-table-column label="意向资源类型" prop="shopName" min-width="150" />
-              <el-table-column label="最近释放日期" prop="businessStartTime" min-width="150" />
-              <el-table-column label="最短租期" prop="contactInformation" min-width="150" />
-              <el-table-column label="意向租金单价(元/平方)" prop="contactInformation" min-width="250" />
-              <el-table-column prop="auditStatus" label="资源状态" min-width="150">
+              <el-table-column label="意向资源类型"  min-width="150">
                 <template slot-scope="scope">
-
+                    {{ scope.row.resources.cereRentalPolicies.businessType }}
+                  </template>
+                </el-table-column>
+              <!-- <el-table-column label="最近释放日期" prop="businessStartTime" min-width="150" /> -->
+              <el-table-column label="最短租期" prop="contactInformation" min-width="150" >
+                <template slot-scope="scope">
+                    {{ scope.row.resources.cereRentalPolicies.leaseTerm }}
+                  </template>
+                </el-table-column>
+              <el-table-column label="意向租金单价(元/平方)" prop="contactInformation" min-width="250">
+              <template slot-scope="scope">
+                {{ scope.row.resources.cereRentalPolicies.rentalPrice }}
                 </template>
               </el-table-column>
 
+              <!-- <el-table-column prop="auditStatus" label="资源状态" min-width="150">
+                <template slot-scope="scope">
+                {{ scope.row.cereRentalPolicies.rentalPrice }}
+                </template>
+              </el-table-column> -->
+
             </el-table>
           </div>
         </el-dialog>
@@ -1059,6 +1067,17 @@ async getshen(item){
         this.multipleSelection =[]
       },
       pipei(item){
+        this.pipeiSel={
+        resources:{
+                  cereRentalPolicies:{
+                      businessType:'',
+                      leaseTerm:'',
+                      rentalPrice:''
+                  }
+              },
+          pageNumber:1,
+          pageSize:100,
+        }
         this.pip = true
         this.pipData = []
       },
@@ -1072,11 +1091,11 @@ async getshen(item){
 
       },
       pipeiBtn(){
-        if(this.pipeiSel.resources.cereRentalPolicies.businessType == 'sp'){
+        if(this.pipeiSel.resources.cereRentalPolicies.businessType == '商铺'){
           this.pipeiSel.resourcesId = 'sp'
-        }else if(this.pipeiSel.resources.cereRentalPolicies.businessType == 'cd'){
+        }else if(this.pipeiSel.resources.cereRentalPolicies.businessType == '场地'){
            this.pipeiSel.resourcesId = 'cd'
-        }else{
+        }else if(this.pipeiSel.resources.cereRentalPolicies.businessType == '广告位'){
            this.pipeiSel.resourcesId = 'gg'
         }
         ziyuanduiy(this.pipeiSel).then(res=>{
@@ -1094,7 +1113,7 @@ async getshen(item){
               },
            resourcesId:'',
           pageNumber:1,
-          pageSize:10,
+          pageSize:100,
         },
         this.pipData = []
       },
diff --git a/yanshouban/src/views/detect/addziyuan.vue b/yanshouban/src/views/detect/addziyuan.vue
index e6066d0..032704a 100644
--- a/yanshouban/src/views/detect/addziyuan.vue
+++ b/yanshouban/src/views/detect/addziyuan.vue
@@ -630,11 +630,6 @@
             message: '请输入详细位置',
           trigger: 'blur'
           }, ],
-          displayMainImage: [{
-            required: true,
-            message: '请上传主图',
-           trigger: 'blur'
-          }, ],
           belongingGreenwaySection: [{
             required: true,
             message: '请选择所属绿道段',
diff --git a/yanshouban/src/views/detect/admap.vue b/yanshouban/src/views/detect/admap.vue
index febb151..54a222c 100644
--- a/yanshouban/src/views/detect/admap.vue
+++ b/yanshouban/src/views/detect/admap.vue
@@ -250,8 +250,15 @@
                 <el-table-column label="详细位置" min-width="6%" prop="detailedLocation" v-if="activeName == 'third'">
                 </el-table-column>
                 <el-table-column label="租赁状态" min-width="6%" v-if="activeName == 'third'">
+                  <template slot-scope="scope">
+                    {{scope.row.rentalStatus == 0?'未租':'已租'}}
+                  </template>
+
                 </el-table-column>
                 <el-table-column label="发布状态" min-width="6%" v-if="activeName == 'third'">
+                  <template slot-scope="scope">
+                    {{scope.row.publishStatus == 0?'待发布':'已提交'}}
+                  </template>
                 </el-table-column>
                 <el-table-column label="操作" width="auto" min-width="10%" v-if="activeName == 'third'">
                   <template slot-scope="scope" fixed="right">
@@ -264,12 +271,7 @@
               </el-table>
 
             </el-tab-pane>
-            <div class="fenye">
 
-                              <el-pagination class="pagination" :hide-on-single-page="flag" background small
-                                :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" layout="total,prev, pager,next"
-                                :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-                            </div>
             <!-- <el-tab-pane label="临铺" name="fourth">
                 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
                   :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
@@ -292,7 +294,12 @@
                      </el-table>
               </el-tab-pane> -->
           </el-tabs>
+<div class="fenye">
 
+                              <el-pagination class="pagination" :hide-on-single-page="flag" background
+                                :current-page="currentPage" layout="total,prev, pager,next"
+                                :total="total"  @current-change="handleCurrentChange" />
+                            </div>
         </div>
       </div>
     </div>
@@ -1870,6 +1877,8 @@ lvdaoList:[]
         this.parentMessage = res.data.content
         const lvdao = await lvdaoduan()
         this.lvdaoList = lvdao.data
+        this.total = res.data.content.length
+
       },
       //查询全数据
       async getAll() {
@@ -1944,6 +1953,7 @@ lvdaoList:[]
           this.setzulin(res.data.content)
           this.parentMessage = res.data.content
           this.total = res.data.content.length
+          this.currentPage = 1
         } else if (event == 'second') {
           // this.pageindex.advertisingType = '实体广告位'
           const res = await getAllMap(this.pageindex)
@@ -1951,12 +1961,14 @@ lvdaoList:[]
           this.setzulin(res.data.content)
           this.tableData = res.data.content
           this.total = res.data.content.length
+          this.currentPage = 1
         } else if (event == 'third') {
           const res = await changAlls(this.pageindex)
           this.tableData = res.data.content
           this.setzulin(res.data.content)
           this.parentMessage = res.data.content
           this.total = res.data.content.length
+          this.currentPage = 1
         } else if (event == 'fourth') {
           this.parentMessage = []
           this.tableData = []
diff --git a/yanshouban/src/views/detect/ziyuanList.vue b/yanshouban/src/views/detect/ziyuanList.vue
index 86b20f7..e1e35de 100644
--- a/yanshouban/src/views/detect/ziyuanList.vue
+++ b/yanshouban/src/views/detect/ziyuanList.vue
@@ -411,11 +411,7 @@
             message: '请输入详细位置',
             trigger: []
           }, ],
-          displayMainImage: [{
-            required: true,
-            message: '请上传主图',
-            trigger: []
-          }, ],
+
           belongingGreenwaySection: [{
             required: true,
             message: '请选择所属绿道段',
diff --git a/yanshouban/src/views/ipm/inr/index.vue b/yanshouban/src/views/ipm/inr/index.vue
index ca32483..043a413 100644
--- a/yanshouban/src/views/ipm/inr/index.vue
+++ b/yanshouban/src/views/ipm/inr/index.vue
@@ -290,8 +290,8 @@
                                       :auto-upload="true" v-if="steat == false">
                                       <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover" v-if="fileData.length ==0">+点击上传</el-button>
                                     </el-upload>
+<a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"  v-if="steat&&secondData.otherAttachments" :href="secondData.otherAttachments.url" target="_blank" download>{{secondData.otherAttachments.name}}</a>
 
-                                    <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="steat&&secondData.otherAttachments ">{{secondData.otherAttachments.name}}</div>
                   </el-form-item>
                   <el-form-item label="现场照片">
                     <upimg v-model="formInline.onSitePhotos" :limit="1" :fileSize="1" :isShowTip="false" v-if="steat ==false"></upimg>
diff --git a/yanshouban/src/views/rent/audit/index.vue b/yanshouban/src/views/rent/audit/index.vue
index 328ffd5..450b9ad 100644
--- a/yanshouban/src/views/rent/audit/index.vue
+++ b/yanshouban/src/views/rent/audit/index.vue
@@ -1372,6 +1372,18 @@
                   </template>
                   <el-input v-model="formInline.orderNumber" placeholder="请输入" style="width:100%;" />
                 </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    商户名称
+                  </template>
+                  <el-input v-model="formInline.leaseName" placeholder="请输入" style="width:100%;" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    租赁类型
+                  </template>
+                  <el-input v-model="formInline.leaseType" placeholder="请输入" style="width:100%;" />
+                </el-descriptions-item>
               </el-descriptions>
             </div>
             <div class="xinxiInput">
@@ -1417,19 +1429,25 @@
                   <template slot="label">
                     合同签订日期
                   </template>
-                  <el-input v-model="heForm.contractSigningDate" placeholder="请输入" style="width:100%;" />
+                  <el-date-picker  v-model="heForm.contractSigningDate"
+                    value-format="yyyy-MM-dd"    type="date"   placeholder="请选择" prefix-icon="none">
+                  </el-date-picker>
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">
                     合同终止日期
                   </template>
-                  <el-input v-model="heForm.contractTerminationDate" placeholder="请输入" style="width:100%;" />
+                  <el-date-picker  v-model="heForm.contractTerminationDate"
+                    value-format="yyyy-MM-dd"    type="date"   placeholder="请选择" prefix-icon="none">
+                  </el-date-picker>
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">
                     起租日期
                   </template>
-                  <el-input v-model="heForm.leaseStartDate" placeholder="请输入" style="width:100%;" />
+                  <el-date-picker  v-model="heForm.leaseStartDate"
+                    value-format="yyyy-MM-dd"    type="date"   placeholder="请选择" prefix-icon="none">
+                  </el-date-picker>
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">
@@ -1471,8 +1489,8 @@
                   <template slot="label">
                     商铺编号
                   </template>
-                  {{heForm.shopNumber}}
-                  <!-- <el-input v-model="heForm.shopNumber" placeholder="请输入" style="width:100%;"  disabled /> -->
+
+                  <el-input v-model="heForm.shopNumber" placeholder="请输入" style="width:100%;" disabled />
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">
@@ -1656,6 +1674,7 @@
          rentalResourcesId:'',
          businessPurpose:'',
          auditStatus:'',
+
         },
         secondData: {},
         shenheMsg:{
@@ -1720,7 +1739,8 @@ contractNumber: '', //合同对应的ID
         ziyuanData:[],
         multipleSelection:[],
         selData:[],
-        miList:['idNumber','unifiedSocialCreditCode','legalRepresentative','residence','emailAddress']
+        miList:['idNumber','unifiedSocialCreditCode','legalRepresentative','residence','emailAddress'],
+        hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount','tenantName','tenantTelephone','tenantBankAccount'],
       }
     },
 
@@ -1934,7 +1954,7 @@ contractNumber: '', //合同对应的ID
            contractStatus: '', //合同状态
            dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
        }
-       this.heForm.shopNumber = item.rentalResourcesId
+       this.heForm.shopNumber = item.cereBasicInformationShop.venueNumber  || item.cereBasicInformationVenue.venueNumber
        this.heForm.relatedMerchants = item.applicant
 
         this.luheShow = true
@@ -1960,14 +1980,15 @@ contractNumber: '', //合同对应的ID
          this.luheShow = false
       },
       hecheck(){
-
        if(this.hefuData.length !=0){
           this.heForm.appendicesContract = JSON.stringify(this.hefuData[0])
        }
-       contractAdd(this.heForm).then(res => {
+let heinfo =  this.$decryptall(this.heForm,this.hemiList)
+       contractAdd(heinfo).then(res => {
           msgedit({auditStatus:'4',id:this.secondData.id,contractNumber:res.data.contractNumber})
          this.formInline.contractNumber = res.data.contractNumber
          this.formInline.createDate = this.currentTime()
+         this.formInline.rentalCondition = '1'
          cereLeasingAdd(this.formInline).then(res => {
            this.getAll()
          })
diff --git a/yanshouban/src/views/scheme/addressguan.vue b/yanshouban/src/views/scheme/addressguan.vue
index 0dcafc8..65ae0ae 100644
--- a/yanshouban/src/views/scheme/addressguan.vue
+++ b/yanshouban/src/views/scheme/addressguan.vue
@@ -13,7 +13,7 @@
             </el-input>
           </div>
           <div>
-            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查看
             </el-button>
             <el-button @click="resetting" class="buttonHover"
               style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
@@ -70,7 +70,7 @@
         </div>
       </el-dialog>
       <el-button @click="quxiao()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
-        class="buttonHover">取 消</el-button>
+        class="buttonHover">返回</el-button>
     </div>
 </template>
 
diff --git a/yanshouban/src/views/scheme/planningBz.vue b/yanshouban/src/views/scheme/planningBz.vue
index 9da0881..abf8a91 100644
--- a/yanshouban/src/views/scheme/planningBz.vue
+++ b/yanshouban/src/views/scheme/planningBz.vue
@@ -284,7 +284,7 @@
               <el-col :span="24">
                 <el-form-item label="招商规划方案上传">
                   <!-- <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="xiangqing==1" @click="yulanFu(secondData.annex)">{{secondData.annex.name}}</div> -->
-                  <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"  v-if="xiangqing==1&&secondData.annex" :href="secondData.annex.response.data.url" target="_blank" download>{{secondData.annex.name}}</a>
+                  <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"  v-if="xiangqing==1&&secondData.annex" :href="secondData.annex.url" target="_blank" download>{{secondData.annex.name}}</a>
                   <el-upload class="upload-demo" ref="upload" :action="upload" :on-preview="handlePreview"  v-else
                    :on-success="handleSuccess"
                     :on-remove="handleRemove" :file-list="fileList" :auto-upload="true" :on-change="handleChange">
@@ -570,9 +570,13 @@ this.total = res.data.content.length
 
          })
          }
+
          if(this.fileList.length !=0){
            this.secondData.annex = JSON.stringify(this.fileList[0])
+         }else{
+           this.secondData.annex = ''
          }
+
             updateList(this.secondData).then(res => {
             this.$message({
               message: '保存成功',
diff --git a/yanshouban/src/views/scheme/planningPar.vue b/yanshouban/src/views/scheme/planningPar.vue
index e4a650b..cf0ec6a 100644
--- a/yanshouban/src/views/scheme/planningPar.vue
+++ b/yanshouban/src/views/scheme/planningPar.vue
@@ -378,7 +378,7 @@
 
              <el-form-item label="招商规划方案上传">
 
-               <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"  v-if="secondData.annex" :href="secondData.annex.response.data.url" target="_blank" download>{{secondData.annex.name}}</a>
+               <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"  v-if="secondData.annex" :href="secondData.annex.url" target="_blank" download>{{secondData.annex.name}}</a>
 
              </el-form-item>
 
@@ -572,7 +572,7 @@
                   <el-col :span="24">
                     <el-form-item label="招商规划方案上传">
                       <!-- <div style="padding:10px 0;line-height:20px;color:#3F9B6A"  @click="yulanFu(secondData.annex)">{{secondData.annex.name}}</div> -->
-                      <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"  v-if="secondData.annex" :href="secondData.annex.response.data.url" target="_blank" download>{{secondData.annex.name}}</a>
+                      <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"  v-if="secondData.annex" :href="secondData.annex.url" target="_blank" download>{{secondData.annex.name}}</a>
 
 
                     </el-form-item>
@@ -641,7 +641,6 @@
         pageindex: {
           pageNumber: 1,
           pageSize: 10,
-          reviewStatus:'1'
         },
         fileList: [],
         ggXinShow:true,
diff --git a/yanshouban/src/views/scheme/samXin.vue b/yanshouban/src/views/scheme/samXin.vue
index 7747b92..f682953 100644
--- a/yanshouban/src/views/scheme/samXin.vue
+++ b/yanshouban/src/views/scheme/samXin.vue
@@ -431,10 +431,6 @@
               message: '请输入租金价格'
             },
             {
-              type: 'number',
-              message: '必须为数字值'
-            },
-            {
               validator: (rule, value, callback) => {
                 if (value <= 0) {
                   callback(new Error('租金价格必须大于0'));
diff --git a/yanshouban/src/views/shopRental/manage/index.vue b/yanshouban/src/views/shopRental/manage/index.vue
index c56455b..fa10676 100644
--- a/yanshouban/src/views/shopRental/manage/index.vue
+++ b/yanshouban/src/views/shopRental/manage/index.vue
@@ -119,8 +119,8 @@
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div @click="addbuss(2,scope.row)" class="tableBtn greens" v-if="scope.row.cereContractInformation.dataStatus==1">编辑</div>
-             <div @click="biangeng(scope.row)" class="tableBtn greens">变更</div>
-              <div @click="xuyue(scope.row)" class="tableBtn greens" >续约</div>
+             <div @click="biangeng(scope.row)" class="tableBtn greens"  v-if="scope.row.cereContractInformation.dataStatus==1">变更</div>
+              <div @click="xuyue(scope.row)" class="tableBtn greens"  v-if="scope.row.cereContractInformation.dataStatus==1">续约</div>
               <div @click="zhongzhi(scope.row)" class="tableBtn greens" v-if="scope.row.cereContractInformation.dataStatus==1">终止</div>
               <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
             </template>
@@ -360,7 +360,7 @@
                   <div v-if="index ==2">{{heForm.contractSigningDate}}</div>
                   <!-- <el-input v-model="heForm.contractSigningDate"  style="width:100%;" v-else placeholder="请输入"/> -->
                   <el-date-picker  v-model="heForm.contractSigningDate"
-                    value-format="yyyy-MM-dd HH:mm:ss"    type="datetime" v-else placeholder="请选择" prefix-icon="none">
+                    value-format="yyyy-MM-dd"    type="date" v-else  placeholder="请选择" prefix-icon="none">
                   </el-date-picker>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -370,7 +370,7 @@
                   <div v-if="index ==2">{{heForm.contractTerminationDate}}</div>
                   <!-- <el-input v-model="heForm.contractTerminationDate"  style="width:100%;" v-else placeholder="请输入"/> -->
                   <el-date-picker  v-model="heForm.contractTerminationDate"
-                    value-format="yyyy-MM-dd HH:mm:ss"    type="datetime" v-else  placeholder="请选择" prefix-icon="none">
+                    value-format="yyyy-MM-dd"    type="date" v-else  placeholder="请选择" prefix-icon="none">
                   </el-date-picker>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -380,7 +380,7 @@
                   <div v-if="index ==2">{{heForm.leaseStartDate}}</div>
                   <!-- <el-input v-model="heForm.leaseStartDate"  style="width:100%;" v-else placeholder="请输入"/> -->
                   <el-date-picker  v-model="heForm.leaseStartDate"
-                    value-format="yyyy-MM-dd HH:mm:ss"    type="datetime" v-else  placeholder="请选择" prefix-icon="none">
+                    value-format="yyyy-MM-dd"    type="date" v-else  placeholder="请选择" prefix-icon="none">
                   </el-date-picker>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -578,7 +578,7 @@
         <div style="display: flex;justify-content: flex-end;">
           <el-button @click="xuyueShow=false" class="buttonHover"
             style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
-          <el-button @click="xuyueShow=false" style="background-color: #3F9B6A;color: #fff">确定</el-button>
+          <el-button @click="xuyueCheck" style="background-color: #3F9B6A;color: #fff">确定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -633,7 +633,7 @@
         <div style="display: flex;justify-content: flex-end;">
           <el-button @click="biangengShow=false" class="buttonHover"
             style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
-          <el-button @click="xuyueShow=false" style="background-color: #3F9B6A;color: #fff">确定</el-button>
+          <el-button @click="biangenCheck" style="background-color: #3F9B6A;color: #fff">确定</el-button>
         </div>
       </div>
       <el-dialog :visible.sync="bianAddShow" custom-class="bian_css" style="padding: 0;" width="50%" center
@@ -1454,6 +1454,14 @@ hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount'
             if(this.hefuData.length!=0){
               this.heForm.appendicesContract =  JSON.stringify(this.hefuData[0])
             }
+
+
+            if(this.hefuData.length!=0){
+              this.heForm.planeFigure =  JSON.stringify(this.pingimgData[0])
+            }
+            if(this.hefuData.length!=0){
+              this.heForm.promotionImage =  JSON.stringify(this.xuanimgData[0])
+            }
           this.heForm.createDate = this.currentTime()
           let heinfo =  this.$decryptall(this.heForm,this.hemiList)
           contractAdd(heinfo).then(res => {
@@ -1467,6 +1475,9 @@ hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount'
         } else if (val == 2) {
           this.heForm.updateDate = ''
           this.heForm.createDate =  this.currentTime()
+           if(typeof this.heForm.appendicesContract == 'object'){
+             this.heForm.appendicesContract = JSON.stringify(this.heForm.appendicesContract)
+           }
           let heinfo =  this.$decryptall(this.heForm,this.hemiList)
         updateList(heinfo).then(res=>{
            this.formInline.contractNumber = res.data.contractNumber
@@ -1542,7 +1553,8 @@ hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount'
       details(val) {
         this.xiangData = val
         this.heData = val.cereContractInformation
-        if(typeof this.heData.appendicesContract == 'string'){
+
+        if(typeof this.heData.appendicesContract == 'string' &&  this.heData.appendicesContract != ''){
           this.heData.appendicesContract = JSON.parse(this.heData.appendicesContract)
         }
 
@@ -1588,7 +1600,9 @@ hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount'
            promotionImage: '',
            notes: '',
            rentalCondition:0,
+
          }//租赁信息字段
+
         this.heForm={
            contractNumber: '', //合同对应的ID
            sectionNumber: '',
@@ -1618,6 +1632,10 @@ hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount'
            contractStatus: '', //合同状态
            dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
          } //合同字段
+         this.pingimgData =[]
+         this.videoData=[]
+         this.xuanimgData=[]
+          this.hefuData=[]
         } else if (val == 2) {
         this.heForm = item.cereContractInformation
         const { cereContractInformation, ...rest } = item
@@ -1709,7 +1727,9 @@ this.ggXin = true
         this.zhong.contractNumber = item.cereContractInformation.contractNumber
         this.zhong.leaseStartDate = item.cereContractInformation.leaseStartDate
         this.zhong.tenantTelephone = item.cereContractInformation.tenantTelephone
+
         this.zhong.id= item.cereContractInformation.id
+
       },
       xuyue(item) {
         this.xuyueShow = true
@@ -1719,12 +1739,14 @@ this.ggXin = true
         this.xuyueData.leaseStartDate = item.cereContractInformation.leaseStartDate
         this.xuyueData.contractAmount = item.cereContractInformation.contractAmount
         this.xuyueData.tenantTelephone = item.cereContractInformation.tenantTelephone
+        this.xuyueData.id= item.cereContractInformation.id
       },
       biangeng(item) {
         this.biangengShow = true
           this.biangengData.lessorName = item.cereContractInformation.lessorName
           this.biangengData.tenantName= item.cereContractInformation.tenantName
           this.biangengData.contractNumber = item.cereContractInformation.contractNumber
+          this.biangengData.id= item.cereContractInformation.id
       },
       bianAdd() {
         this.bianList={
@@ -1793,6 +1815,21 @@ this.ggXin = true
 
          this.bianAddShow =false
       },
+      async  zhongCheck(){
+        await updateList({id:this.zhong.id,dataStatus:'3'})
+        this.getAll()
+          this.zhongzhiShow = false
+        },
+
+      biangenCheck(){
+
+        // await updateList({id:this.biangengData.id,dataStatus:'3'})
+        this.biangengShow = false
+      },
+     async xuyueCheck(){
+       await updateList({id:this.xuyueData.id ,rentalCondition:'3'})
+        this.xuyueShow = false
+      },
       bianEdit(item){
         this.biangengPan = true
         this.bianList = item
@@ -1821,16 +1858,12 @@ this.ggXin = true
 
                     })
            })
-
-                   this.daoIndex = 1
+this.fileData =[]
+                   // this.daoIndex = 1
          }
 
 
         },
-      async  zhongCheck(){
-        await updateList({id:this.zhong.id,dataStatus:'3'})
-          this.zhongzhiShow = false
-        }
 
     }
   }
diff --git a/yanshouban/src/views/shopRental/rentalMan/index.vue b/yanshouban/src/views/shopRental/rentalMan/index.vue
index 742c4b4..d0eb6ac 100644
--- a/yanshouban/src/views/shopRental/rentalMan/index.vue
+++ b/yanshouban/src/views/shopRental/rentalMan/index.vue
@@ -564,152 +564,28 @@
                                              </el-descriptions-item>
                                              <el-descriptions-item>
                                                <template slot="label">
-                                                 状态
+                                                 订单编号
                                                </template>
-                                               <span v-if="bianZt">{{xiangData.state}}</span>
-                                               <el-input v-model="xiangData.state" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                           </el-descriptions>
-                                       </div>
-                                       <div style="">
-                                          <el-descriptions class="margin-top" :column="3"  border :labelStyle="labelStyle"
-                                          :contentStyle="contentStyle">
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 租赁类型
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.leaseType}}</span>
-                                               <el-input v-model="xiangData.leaseType" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 编号
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.leaseCode}}</span>
-                                               <el-input v-model="xiangData.leaseCode" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 名称
-                                               </template>
-                                             <span v-if="bianZt">{{xiangData.leaseName}}</span>
-                                             <el-input v-model="xiangData.leaseName" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 行政区
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.administrativeRegion}}</span>
-                                               <el-input v-model="xiangData.administrativeRegion" placeholder="请输入" style="width:100%;" v-else/>
+                                               <span v-if="bianZt">{{xiangData.orderNumber}}</span>
+                                               <el-input v-model="xiangData.orderNumber" placeholder="请输入" style="width:100%;" v-else/>
                                              </el-descriptions-item>
                                              <el-descriptions-item>
                                                <template slot="label">
-                                                 地址
+                                                 商户名称
                                                </template>
-                                               <span v-if="bianZt">{{xiangData.leaseAddress}}</span>
-                                               <el-input v-model="xiangData.leaseAddress" placeholder="请输入" style="width:100%;" v-else/>
+                                               <span v-if="bianZt">{{xiangData.leaseName}}</span>
+                                               <el-input v-model="xiangData.leaseName" placeholder="请输入" style="width:100%;" v-else/>
                                              </el-descriptions-item>
                                              <el-descriptions-item>
                                                <template slot="label">
-                                                 所属主体
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.owner}}</span>
-                                               <el-input v-model="xiangData.owner" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 负责人
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.commander}}</span>
-                                               <el-input v-model="xiangData.commander" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 联系电话
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.telephone}}</span>
-                                               <el-input v-model="xiangData.telephone" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 范围
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.scope}}</span>
-                                               <el-input v-model="xiangData.scope" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 面积
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.area}}</span>
-                                               <el-input v-model="xiangData.area" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 建成时间
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.completionTime}}</span>
-                                               <el-input v-model="xiangData.completionTime" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 房屋类型
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.houseType}}</span>
-                                               <el-input v-model="xiangData.houseType" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 主要设施
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.mainFacilities}}</span>
-                                               <el-input v-model="xiangData.mainFacilities" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 平面图
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.planeFigure}}</span>
-                                               <el-input v-model="xiangData.planeFigure" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 收费标准
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.feeStandards}}</span>
-                                               <el-input v-model="xiangData.feeStandards" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 标签
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.label}}</span>
-                                               <el-input v-model="xiangData.label" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 宣传视频
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.promotionVideo}}</span>
-                                               <el-input v-model="xiangData.promotionVideo" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 宣传图片
-                                               </template>
-                                               <span v-if="bianZt">{{xiangData.promotionImage}}</span>
-                                               <el-input v-model="xiangData.promotionImage" placeholder="请输入" style="width:100%;" v-else/>
-                                             </el-descriptions-item>
-                                             <el-descriptions-item>
-                                               <template slot="label">
-                                                 备注信息
+                                                 租赁类型
                                                </template>
-                                               <span v-if="bianZt">{{xiangData.notes}}</span>
-                                               <el-input v-model="xiangData.notes" placeholder="请输入" style="width:100%;" v-else/>
+                                               <span v-if="bianZt">{{xiangData.leaseType}}</span>
+                                               <el-input v-model="xiangData.leaseType" placeholder="请输入" style="width:100%;" v-else/>
                                              </el-descriptions-item>
                                            </el-descriptions>
                                        </div>
+
                                        <div style="font-size: 14px;padding: 20px 0;color: #000;">合同信息</div>
                                        <div>
                                          <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
@@ -718,8 +594,8 @@
                                              <template slot="label">
                                                合同编号
                                              </template>
-                                             <div v-if="bianZt">{{heData.contractNumber}}</div>
-                                             <el-input v-model="heData.contractNumber"  style="width:100%;" v-else placeholder="请输入"/>
+                                             <div>{{heData.contractNumber}}</div>
+
                                            </el-descriptions-item>
                                            <el-descriptions-item>
                                              <template slot="label">
@@ -991,13 +867,9 @@
   excelRentOutQueryByPage,
   pdfRentOutQueryByPage
   } from '../../../api/rentalMan.js'
-import {
-  businessListSave,
-  businessListGetById,
-  businessListUpdate,
-  businessListStart,
-  delBusinessById
-} from '@/api/business'
+  import {
+    updateList
+  } from '../../../api/manage.js'
   import upimg from "@/components/ImageUpload/index"
   import wangEditor from "@/components/editor/index"
   import html2canvas from 'html2canvas'
@@ -1087,6 +959,8 @@ import {
                   height:'42px',
                   color:'#000',
                 },
+                miList:['telephone','commander','leaseAddress','administrativeRegion','operator','tenant' ],
+                hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount','tenantName','tenantTelephone','tenantBankAccount'],
       }
     },
     created() {
@@ -1120,8 +994,8 @@ import {
           res.commander = this.$decrypt(res.commander)
           res.leaseAddress = this.$decrypt(res.leaseAddress)
           res.administrativeRegion = this.$decrypt(res.administrativeRegion)
-          res.operator = this.$decrypt(res.operator)
-          res.tenant = this.$decrypt(res.tenant)
+          // res.operator = this.$decrypt(res.operator)
+          // res.tenant = this.$decrypt(res.tenant)
           res.cereContractInformation.earnestMoney =this.$decrypt(res.cereContractInformation.earnestMoney)
           res.cereContractInformation.contractAmount =this.$decrypt(res.cereContractInformation.contractAmount)
           res.cereContractInformation.lessorName =this.$decrypt(res.cereContractInformation.lessorName)
@@ -1158,6 +1032,7 @@ import {
        details(val,item){
          this.xiangData = item
          this.heData = item.cereContractInformation
+         console.log(item)
         if(val == 1){
           this.bianZt = false
         }else{
@@ -1168,16 +1043,30 @@ import {
 
       },
       addbuss(val,item) {
-        this.index = val
-        this.detbox = false
-        this.ggXin = true
-        this.zhong.lessorName = item.cereContractInformation.lessorName
-        this.zhong.tenantName = item.cereContractInformation.tenantName
-        this.zhong.leaseAddress = item.leaseAddress
-        this.zhong.leaseName = item.leaseName
-        this.zhong.completionTime = item.completionTime
-        this.zhong.intendedLeaseTerm = item.intendedLeaseTerm
-        this.zhong.intentionalRent = item.intentionalRent
+       this.index = val
+        if(val == 2){
+          this.detbox = false
+          this.heData.createDate =''
+          delete  this.heData.updateDate
+          let heinfo =  this.$decryptall(this.heData,this.hemiList)
+          updateList(heinfo).then(res=>{
+             this.xiangData.contractNumber = res.data.contractNumber
+             delete  this.xiangData.updateDate
+                 let newinfo =  this.$decryptall(this.xiangData,this.miList)
+              cereLeasingEdit(newinfo).then(item=>{
+
+              })
+        })
+        }else{
+          this.ggXin = true
+          this.zhong.lessorName = item.cereContractInformation.lessorName
+          this.zhong.tenantName = item.cereContractInformation.tenantName
+          this.zhong.leaseAddress = item.leaseAddress
+          this.zhong.leaseName = item.leaseName
+          this.zhong.completionTime = item.completionTime
+          this.zhong.intendedLeaseTerm = item.intendedLeaseTerm
+          this.zhong.intentionalRent = item.intentionalRent
+        }
       },
       handleSizeChange(val) {
         this.pageSize = val
diff --git a/yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue b/yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
index 3205276..18ebf8e 100644
--- a/yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
+++ b/yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
@@ -22,6 +22,9 @@
 						<u-form-item label="链接" prop="redirectUrl" borderBottom>
 							<u-input v-model="model1.redirectUrl"></u-input>
 						</u-form-item>
+						<u-form-item label="投放定价" prop="cpc" borderBottom>
+							<u-input v-model="model1.cpc"></u-input>
+						</u-form-item>
 					</view>
 					<view class="add-list">
 						<u-form-item label="封面图片" prop="coverImage" borderBottom labelPosition="top">
@@ -33,7 +36,7 @@
 							<u-input v-model="model1.adTitle" />
 						</u-form-item>
 					</view>
-
+						
 				</u-form>
 			</view>
 
@@ -200,6 +203,7 @@
 					redirectUrl: '',
 					coverImage: '',
 					adTitle: '',
+					cpc:'',
 					subjectName: '',
 					unifiedSocialCreditCode: '',
 					type: '',
diff --git a/yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss b/yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss
index 5fa5eb8..d9c56ee 100644
--- a/yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss
+++ b/yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss
@@ -51,8 +51,8 @@
 			margin-bottom: 30rpx;
 		}
 		.info-racord {
-			display: flex;
-			justify-content: space-between;
+			// display: flex;
+			// justify-content: space-between;
 			align-items: center;
 			.info-price {
 				color: #31AA6A;
diff --git a/yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue b/yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
index e18bdfe..379dacd 100644
--- a/yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
+++ b/yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
@@ -7,8 +7,8 @@
 			</view>
 			<view class="info-text">{{tableData.shopDescription}}</view>
 			<view class="info-racord">
-				<view class="info-price"><span>1000</span>元/月</view>
-				<view class="info-intention">2456人有意向</view>
+				<view class="info-price" v-for="(item,index) in celueList"><span>{{item.rentalPrice}}</span>元/{{item.leaseTerm}}</view>
+				<!-- <view class="info-intention">2456人有意向</view> -->
 			</view>
 		</view>
 		<view class="banner-item field">
@@ -99,11 +99,17 @@ export default {
 		],
 		latitude: 39.909,
 		longitude: 116.39742,
+		celueList:[]
     };
   },
   onLoad(option){
 	let data = JSON.parse(option.item)
+	console.log(option)
 	this.tableData = data;
+	if(option.celue != ''){
+		let celue = JSON.parse(option.celue)
+		this.celueList = celue
+	}
   },
   methods: {
 	  leaseAdd(url){
diff --git a/yslvdao-miniapp/pages/details/details.scss b/yslvdao-miniapp/pages/details/details.scss
index e25d405..f252613 100644
--- a/yslvdao-miniapp/pages/details/details.scss
+++ b/yslvdao-miniapp/pages/details/details.scss
@@ -57,8 +57,8 @@
 			margin-bottom: 30rpx;
 		}
 		.info-racord {
-			display: flex;
-			justify-content: space-between;
+			// display: flex;
+			// justify-content: space-between;
 			align-items: center;
 			.info-price {
 				color: #31AA6A;
diff --git a/yslvdao-miniapp/pages/details/details.vue b/yslvdao-miniapp/pages/details/details.vue
index cad3acf..a05c0f7 100644
--- a/yslvdao-miniapp/pages/details/details.vue
+++ b/yslvdao-miniapp/pages/details/details.vue
@@ -11,8 +11,8 @@
 			</view>
 			<view class="info-text">{{tableData.shopDescription}}</view>
 			<view class="info-racord">
-				<view class="info-price"><span>{{tableData.id *160}}</span>元/月</view>
-				<view class="info-intention">{{tableData.id}}人有意向</view>
+				<view class="info-price" v-for="(item,index) in celueList"><span>{{item.rentalPrice}}</span>元/{{item.leaseTerm}}</view>
+				<!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
 			</view>
 		</view>
 		<view class="banner-item field">
@@ -120,12 +120,20 @@ export default {
 		latitude: 39.909,
 		longitude: 116.39742,
 		qianzui:'',
+		celueList:[]
     };
   },
   onLoad(option){
 	  
 	let data = JSON.parse(option.item)
-	console.log(data)
+	
+	if(option.celue != ''){
+		let celue = JSON.parse(option.celue)
+		this.celueList = celue
+	}
+	
+	
+	
 	if(data.shopName){
 		this.qianzui = 'sp'
 	}else{
diff --git a/yslvdao-miniapp/pages/home/home.vue b/yslvdao-miniapp/pages/home/home.vue
index c464bed..b4e4429 100644
--- a/yslvdao-miniapp/pages/home/home.vue
+++ b/yslvdao-miniapp/pages/home/home.vue
@@ -228,15 +228,15 @@
 					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
 						<view v-for="(item, index) in tableData" :key="index" class="scroll-view-item_H" @click="details(item)">
 							<view class="business-card">
-								<u-image :showLoading="true" :src="item.displayMainImage || item.locationDiagram || item.displayImage" width="100%" height="210rpx"></u-image>
+								<u-image :showLoading="true" :src="item.cereBasicInformationShop.displayMainImage || item.cereAdvertisingInformation.locationDiagram || item.cereBasicInformationVenue.displayImage" width="100%" height="210rpx"></u-image>
 								<view class="business-card-title">
-									{{ item.shopName || item.advertisingName || item.venueName}}
+									{{ item.cereBasicInformationShop.shopName || item.cereAdvertisingInformation.advertisingName || item.cereBasicInformationVenue.venueName}}
 								</view>
-								<view class="business-card-item">租金：￥<span>{{item.id * 10}}</span>/月</view>
-								<view class="business-card-item">面积：<span>{{item.actualUsableArea?item.actualUsableArea:'55.4'}}</span>/m2</view>
-								<view class="introduce" v-if='item.detailedLocation'>
+								<view class="business-card-item">租金：￥<span>{{item.cereReleasePoliciesVO[0].rentalPrice}}</span>/{{item.cereReleasePoliciesVO[0].leaseTerm}}</view>
+								<view class="business-card-item">面积：<span>{{item.cereBasicInformationShop.actualUsableArea?item.cereBasicInformationShop.actualUsableArea:'55.4'}}</span>/m2</view>
+								<view class="introduce" v-if='item.cereBasicInformationShop.detailedLocation ||item.cereBasicInformationVenue.detailedLocation'>
 									<image  :src="$imgUrl('/kefu.png')"></image>
-									<text class="one-omit">{{item.detailedLocation}}</text>
+									<text class="one-omit">{{item.cereBasicInformationShop.detailedLocation ||item.cereBasicInformationVenue.detailedLocation}}</text>
 								</view>
 							</view>
 						</view>
@@ -255,7 +255,7 @@
 							<view class="business-card">
 								<u-image :showLoading="true" :src="item.coverImage" width="100%" height="210rpx"></u-image>
 								<view class="business-card-title">
-									{{item.activityName}}
+									{{item.activityName || '默认'}}
 								</view>
 								<view class="huo-card-item">创建时间：<span>{{item.startTime}}</span></view>
 								<view class="huo-card-item">参与人数：<span>{{item.maxParticipants}}</span></view>
@@ -412,29 +412,37 @@
 			onCouponTab(type) {
 				let pagesize = {
 					pageNumber: 1,
-					pageSize: 2
+					pageSize: 2,
+					resourceType:'',
+					dataForm:'2'
 				}
 				this.current = type
 				if (type == 0) {
-					this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', pagesize,1).then(res => {
+					pagesize.resourceType = '商铺'
+					this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', pagesize,1).then(res => {
 						//成功回调
+						
 						this.tableData = res.data.data.content
+						console.log(this.tableData)
 					}).catch(err => {
 						console.log(err)
 						//请求失败
 					})
 				} else if (type == 1) {
-					this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', pagesize,1).then(res => {
+					pagesize.resourceType = '场地'
+					this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', pagesize,1).then(res => {
 						//成功回调
 						this.tableData = res.data.data.content
+
 					}).catch(err => {
 						console.log(err)
 						//请求失败
 					})
 					
 				} else if (type == 2) {
-					pagesize.advertisingType = '线上广告位'
-					this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', pagesize,1).then(res => {
+					pagesize.resourceType = '广告位'
+					// pagesize.advertisingType = '线上广告位'
+					this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', pagesize,1).then(res => {
 						//成功回调
 						this.tableData = res.data.data.content
 					}).catch(err => {
@@ -488,16 +496,36 @@
 				
 			},
 		details(item) {
-						let items = JSON.stringify(item)
-						if(this.current == 0 || this.current == 1){
-							uni.navigateTo({
-								url: `/pages/details/details?item=${items}`
-							})
-						}else{
-							uni.navigateTo({
-								url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
-							})
-						}
+			let items = ''
+			let celue = ''
+			 if(this.current == 0){
+				 items = JSON.stringify(item.cereBasicInformationShop)
+				 celue =  JSON.stringify(item.cereReleasePoliciesVO)
+				 uni.navigateTo({
+				 	url: `/pages/details/details?item=${items}&celue=${celue}`
+				 })
+			 }else if(this.current == 1){
+				 items = JSON.stringify(item.cereBasicInformationVenue)
+				 uni.navigateTo({
+				 	url: `/pages/details/details?item=${items}&celue=${celue}`
+				 })
+			 }else{
+				 items = JSON.stringify(item.cereAdvertisingInformation)
+				 celue =  JSON.stringify(item.cereReleasePoliciesVO)
+				 uni.navigateTo({
+				 	url: `/pages/advertisementDetail/advertisementDetail?item=${items}&celue=${celue}`
+				 })
+			 }
+						
+						// if(this.current == 0 || this.current == 1){
+						// 	uni.navigateTo({
+						// 		url: `/pages/details/details?item=${items}`
+						// 	})
+						// }else{
+						// 	uni.navigateTo({
+						// 		url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
+						// 	})
+						// }
 						
 					},
 			setList(val){
diff --git a/yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue b/yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue
index 06e0b66..43cb1b3 100644
--- a/yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue
+++ b/yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue
@@ -316,6 +316,7 @@ getCurrentTime() {
 				this.model1.rentalResourcesId = this.ziyuanId
 				this.model1.applicant = uni.getStorageSync('shopId')
 				this.model1.applicationTime = this.getCurrentTime()
+				
 				this.$http.sendRequest('/cereBusinessInfo/add', 'POST', this.model1, 1).then(res => {
 					uni.redirectTo({
 						url: '/pages/record/record'
diff --git a/yslvdao-miniapp/utils/request.js b/yslvdao-miniapp/utils/request.js
index c0da831..3af5249 100644
--- a/yslvdao-miniapp/utils/request.js
+++ b/yslvdao-miniapp/utils/request.js
@@ -14,9 +14,9 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	}
 	var bases = ''
 	if(baseUrl == 1){
-		// bases = 'http://8.130.38.56:8027/admin-server' + url;
-		// bases = 'http://172.16.61.48/admin-server' + url;
 		bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
+		// bases = 'http://8.130.38.56:8027/admin-server' + url;
+		// bases = 'http://192.168.2.193' + url;
 		
 		
 	}else{