webapp / GreenwayWeb

Commit 9683c4af7843d3ef244800572c7cc6ba0a4b56fa

Authored by 杨鑫
1 parent 7b6de46c

'最新'

Inline Side-by-side
Showing 34 changed files with 667 additions and 400 deletions
merchant-web-master/src/utils/request.js
  View file @9683c4a
... ... @@ -20,8 +20,8 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173') {
20 20 }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){
21 21 // 其他情况的默认值
22 22 // PREFIX = 'http://8.130.38.56:8027/business-server';
23   - // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
24   - PREFIX = 'http://192.168.2.193:9004';
  23 + PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
  24 + // PREFIX = 'http://192.168.2.193:9004';
25 25 }else{
26 26 // PREFIX = '/merchant-business';
27 27 // PREFIX = 'http://8.130.38.56:9004';
... ...
merchant-web-master/src/views/comprehensive/Lcinquiry/index.vue
  View file @9683c4a
... ... @@ -3,7 +3,7 @@
3 3 <div style="background-color:#F2F3F5">
4 4 <div class="history">
5 5 <div style="background-color:#Fff;padding:20px 20px 0 20px">
6   - <div style="font-size:14px;">物资变动查询</div>
  6 +
7 7 <!-- 顶部搜索 -->
8 8 <div class="toolbar">
9 9 <el-form ref="formParams" :inline="true" :model="formParams">
... ... @@ -63,10 +63,10 @@
63 63 </div>
64 64 <!-- 分页 -->
65 65 <div class="fenye">
66   - <div style="line-height: 34px">显示第1到第10条记录</div>
  66 +
67 67 <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
68   - :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total,sizes,prev, pager,next" :total="total "
69   - @size-change="handleSizeChange" @current-change="handleCurrentChange" />
  68 + layout="total,prev, pager,next" :total="total "
  69 + @current-change="handleCurrentChange" />
70 70 </div>
71 71 </div>
72 72 </div>
... ... @@ -80,7 +80,7 @@
80 80 export default {
81 81 data() {
82 82 return {
83   - total: 1,
  83 + total: 0,
84 84 pageSize: 10,
85 85 currentPage: 1,
86 86 formParams: {
... ... @@ -91,7 +91,7 @@ export default {
91 91 formInline: {
92 92 searchType: '1',
93 93 search: '', // 搜索字段
94   - state: '',
  94 + state: '3',
95 95 // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
96 96 dates: [], // 下单时间数组
97 97 page: 1,
... ... @@ -111,14 +111,14 @@ const res = await orderGetAll(this.formInline)
111 111 const Orderlist = await materialChangeInquiry(res.data.list)
112 112 this.tableData = Orderlist.data
113 113 this.total = this.tableData.length
114   -console.log(Orderlist.data)
  114 +
115 115 },
116 116 async search(){
117 117 this.formInline.dates = this.formParams.dates
118   -
119 118 const res = await orderGetAll(this.formInline)
120 119 const Orderlist = await materialChangeInquiry(res.data.list)
121 120 this.tableData = Orderlist.data
  121 + this.total = this.tableData.length
122 122 },
123 123 clear(){
124 124 this.formInline.dates = []
... ...
merchant-web-master/src/views/comprehensive/dAddress/index.vue
  View file @9683c4a
... ... @@ -2,7 +2,6 @@
2 2 <div style="background-color:#F2F3F5">
3 3 <div class="history">
4 4 <div style="background-color:#Fff;padding:20px 20px 0 20px">
5   - <div style="font-size:14px;">收货地统计</div>
6 5 <!-- 顶部搜索 -->
7 6 <div class="toolbar">
8 7 <el-form ref="formParams" :inline="true" :model="formParams">
... ... @@ -27,14 +26,11 @@
27 26 </el-form>
28 27 </div>
29 28 </div>
30   - <div style="display: flex;margin-bottom: 20px;background-color: #fff;">
31   - <div style="border: #EBEEF5 1px solid; margin-right: 20px; width: 45%;" >
32   - <div style="border-bottom: #EBEEF5 1px solid;background-color: #F7F7F7;padding: 10px 15px;">收货地地域分布图</div>
33   - <div ref="container" style="width: 600px; height: 400px;"></div>
34   - </div>
35   - <div style="border: #EBEEF5 1px solid; width: 45%;">
36   - <div style="border-bottom: #EBEEF5 1px solid;background-color: #F7F7F7;padding: 10px 15px;">收货地占比图</div>
37   - <div ref="container1" style="width: 600px; height: 400px;"></div>
  29 + <div style="margin-bottom: 20px;background-color: #fff;">
  30 +
  31 + <div style="border: #EBEEF5 1px solid;width: 100%;">
  32 + <div style="border-bottom: #EBEEF5 1px solid;background-color: #F7F7F7;padding: 10px 15px;">收货地成交图</div>
  33 + <div ref="container1" style="width: 80%; height: 400px;"></div>
38 34 </div>
39 35 </div>
40 36 <!-- 表格 -->
... ... @@ -87,7 +83,7 @@
87 83 export default {
88 84 data() {
89 85 return {
90   - total: 1,
  86 + total: 0,
91 87 flag:false,
92 88 pageSize: 10,
93 89 currentPage: 1,
... ... @@ -120,16 +116,17 @@
120 116 const res = await orderGetAll(this.formInline)
121 117 const Orderlist = await deliveryAddressStatistics(res.data.list)
122 118 this.tableData = Orderlist.data
123   - this.total = this.tableData.length
124   - this.echar1()
  119 + this.total = Orderlist.data.length
  120 + this.echar1(Orderlist.data)
125 121  
126 122 },
127 123 async search(){
128 124 this.formInline.dates = this.formParams.dates
129   -
130 125 const res = await orderGetAll(this.formInline)
131 126 const Orderlist = await deliveryAddressStatistics(res.data.list)
132 127 this.tableData = Orderlist.data
  128 + this.total = Orderlist.data.length
  129 + this.echar1(Orderlist.data)
133 130 },
134 131 clear(){
135 132 this.formInline.dates = []
... ... @@ -142,6 +139,10 @@ async search(){
142 139 echar1(diameter) {
143 140 let Dom = this.$refs.container1
144 141 let myChart = echarts.init(Dom);
  142 + let processedData = diameter.map(item => ({
  143 + name: item.address,
  144 + value: item.refundAmount
  145 + }))
145 146 // 指定图表的配置项和数据
146 147 const option = {
147 148  
... ... @@ -179,13 +180,7 @@ async search(){
179 180 fontSize: 20
180 181 }
181 182 },
182   - data: [
183   - { value: 60, name: 'Visit' },
184   - { value: 40, name: 'Inquiry' },
185   - { value: 20, name: 'Order' },
186   - { value: 80, name: 'Click' },
187   - { value: 100, name: 'Show' }
188   - ]
  183 + data: processedData
189 184 }
190 185 ]
191 186 };
... ...
merchant-web-master/src/views/comprehensive/pEranking/index.vue
  View file @9683c4a
... ... @@ -3,7 +3,7 @@
3 3 <div style="background-color:#F2F3F5">
4 4 <div class="history">
5 5 <div style="background-color:#Fff;padding:20px 20px 0 20px">
6   - <div style="font-size:14px;">商品入库统计</div>
  6 +
7 7 <!-- 顶部搜索 -->
8 8 <div class="toolbar">
9 9 <el-form ref="formParams" :inline="true" :model="formParams">
... ... @@ -51,16 +51,8 @@
51 51 {{scope.row.cereShopComments[0].shopName}}
52 52 </template>
53 53 </el-table-column>
54   - <el-table-column prop="fl" label="商品分类">
55   - <template slot-scope="scope">
56   - <!-- {{scope.row.cereShopComments[0].shopGroupName}} -->
57   - </template>
58   - </el-table-column>
59   - <el-table-column prop="sx" label="属性" >
60   - <template slot-scope="scope">
61   - <!-- {{scope.row.cereShopComments[0].value}} -->
62   - </template>
63   - </el-table-column>
  54 +
  55 +
64 56 <el-table-column prop="ctime" label="商品创建时间" >
65 57 <template slot-scope="scope">
66 58 {{scope.row.cereShopComments[0].createTime}}
... ... @@ -80,10 +72,10 @@
80 72 </div>
81 73 <!-- 分页 -->
82 74 <div class="fenye">
83   - <div style="line-height: 34px">显示第1到第10条记录</div>
  75 +
84 76 <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
85   - :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total,sizes,prev, pager,next" :total="total "
86   - @size-change="handleSizeChange" @current-change="handleCurrentChange" />
  77 + layout="total,prev, pager,next" :total="total"
  78 + @current-change="handleCurrentChange" />
87 79 </div>
88 80 </div>
89 81 </div>
... ... @@ -97,7 +89,7 @@
97 89 export default {
98 90 data() {
99 91 return {
100   - total: 1,
  92 + total: 0,
101 93 pageSize: 10,
102 94 currentPage: 1,
103 95 formParams: {
... ... @@ -155,11 +147,33 @@ export default {
155 147  
156 148 return dateString;
157 149 },
  150 + // 获取时间
  151 + currentTime() {
  152 + let date = new Date();
  153 + let year = date.getFullYear();
  154 + let month = date.getMonth() + 1; // 月份从0~11，所以加一
  155 + let day = date.getDate();
  156 + let hours = date.getHours();
  157 + let minutes = date.getMinutes();
  158 + let seconds = date.getSeconds();
  159 +
  160 + // 为月、日、时、分、秒添加前导零（如果需要）
  161 + month = month < 10 ? '0' + month : month;
  162 + day = day < 10 ? '0' + day : day;
  163 + hours = hours < 10 ? '0' + hours : hours;
  164 + minutes = minutes < 10 ? '0' + minutes : minutes;
  165 + seconds = seconds < 10 ? '0' + seconds : seconds;
  166 +
  167 + // 拼接日期和时间字符串
  168 + let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  169 + return strDate;
  170 + },
158 171 async getAll(){
159 172 let last = this.updateCurrentTime()
160 173 // const res = await orderGetAll(this.formInline)
161   -const Orderlist = await productEvaluationRanking({startTime:last[0],endTime:last[1]})
162   -this.tableData = Orderlist.data.list
  174 +const Orderlist = await productEvaluationRanking({startTime:'2020-1-1 59:59:59',endTime:this.currentTime()})
  175 +this.tableData = Orderlist.data
  176 +this.total = Orderlist.data.length
163 177 },
164 178 async search(){
165 179 this.formInline.dates = this.formParams.dates
... ... @@ -168,7 +182,7 @@ async search(){
168 182 let endTimeS = this.formInline.dates[1] +` 23:59:59`
169 183 const Orderlist = await productEvaluationRanking({startTime:startTimeS,endTime:endTimeS})
170 184 this.tableData = Orderlist.data
171   - console.log(Orderlist.data)
  185 + this.total = Orderlist.data.length
172 186 },
173 187 clear(){
174 188 this.formInline.dates = []
... ...
merchant-web-master/src/views/comprehensive/pcdetails/index.vue
  View file @9683c4a
... ... @@ -3,7 +3,7 @@
3 3 <div style="background-color:#fff">
4 4 <div class="history">
5 5 <div style="background-color:#Fff;padding:20px 20px 0 20px;display:flex;justify-content: space-between;">
6   - <div style="font-size:14px;line-height:200%">商品消费明细</div>
  6 +
7 7 <!-- 顶部搜索 -->
8 8 <div class="toolbar">
9 9 <el-form ref="formParams" :inline="true" :model="formParams">
... ... @@ -45,8 +45,8 @@
45 45 <div style="background-color:#fff;padding: 20px 20px 0px;">
46 46 <div style="background-color:#F2F3F5;padding: 5px;">
47 47 <div style="background-color:#fff;padding:15px">商品消费排行榜</div>
48   - <div style="display:flex;">
49   - <div style="width:80%;height:250px;background-color:#fff;" ref="myEchartsThree" ></div>
  48 + <div style="display:flex; ">
  49 + <div style="width:100%;height:250px;background-color:#fff;padding: 0 20px;" ref="myEchartsThree" ></div>
50 50 <!-- <div style="width:100%;height:250px;background-color:#fff;"></div> -->
51 51 </div>
52 52 </div>
... ... @@ -80,10 +80,10 @@
80 80 </el-table>
81 81 </div>
82 82 <div class="fenye">
83   - <div style="line-height: 34px">显示第1到第10条记录</div>
  83 +
84 84 <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
85   - :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total,sizes,prev, pager,next" :total="total "
86   - @size-change="handleSizeChange" @current-change="handleCurrentChange" />
  85 + layout="total,prev, pager,next" :total="total"
  86 + @current-change="handleCurrentChange" />
87 87 </div>
88 88 </div>
89 89 <!-- 分页 -->
... ... @@ -104,7 +104,7 @@ export default {
104 104 data() {
105 105 return {
106 106 list: [],
107   - total: 1,
  107 + total: 0,
108 108 pageSize: 10,
109 109 currentPage: 1,
110 110 formParams: {
... ... @@ -175,7 +175,7 @@ this.drawsTwo(zhutu.data)
175 175 this.yuantu.rates.push(remai.data.hotSellProducts[i].number)
176 176 }
177 177  
178   - this.draws(this.yuantu)
  178 +
179 179 for(let i =0;i<Orderlist.data.length;i++){
180 180  
181 181 let item = {}
... ... @@ -185,6 +185,7 @@ this.drawsTwo(zhutu.data)
185 185 // this.bing[i].value = Orderlist.data[i].bigDecimal
186 186 // this.bing[i].name = Orderlist.data[i].product.productName
187 187 }
  188 + this.draws(this.bing)
188 189 this.draw(this.bing)
189 190  
190 191 },
... ... @@ -192,6 +193,7 @@ this.drawsTwo(zhutu.data)
192 193 this.formInline.dates = this.formParams.dates
193 194 const res = await orderGetAll(this.formInline)
194 195 this.tableData = res.data.list
  196 + this.total = this.tableData.length
195 197 const Orderlist = await salesRanking(res.data.list)
196 198 const zhutu = await commodityConsumption(res.data.list)
197 199 const remai = await dashIndex(this.form)
... ... @@ -202,11 +204,12 @@ this.drawsTwo(zhutu.data)
202 204 this.yuantu.rates.push(remai.data.hotSellProducts[i].number)
203 205 }
204 206  
205   - this.draws(this.yuantu)
  207 +
206 208 for(let i =0;i<Orderlist.data.length;i++){
207 209 this.bing[i].value = Orderlist.data[i].bigDecimal
208 210 this.bing[i].name = Orderlist.data[i].product.productName
209 211 }
  212 + this.draws(this.bing)
210 213 this.draw(this.bing)
211 214 },
212 215 handleCurrentChange(val) {
... ... @@ -277,17 +280,14 @@ this.drawsTwo(zhutu.data)
277 280 myEchart.setOption(option)
278 281 },
279 282 draws(arr) {
280   - let lo = {
281   - "names": this.yuantu.names,
282   - "rates": this.yuantu.rates
283   - }
  283 + console.log(arr)
284 284 const myEchart = echarts.init(this.$refs.myEchartsThree, 'light')
285 285 // const o = this.chartData
286 286 const option = {
287 287 // color: ["#74d1fd", "#009ae4", "#0071c1"],
288 288 // 设置图表的位置
289 289 grid: {
290   - x: 110, // 左间距
  290 + x: 200, // 左间距
291 291 y: 0, // 上间距
292 292 x2: 60, // 右间距
293 293 y2: 40 // 下间距
... ... @@ -305,7 +305,7 @@ this.drawsTwo(zhutu.data)
305 305 },
306 306 // 提示框浮层内容格式器，支持字符串模板和回调函数两种形式 折线（区域）图、柱状（条形）图、K线图
307 307 // {a}（系列名称），{b}（类目值），{c}（数值）, {d}（无）
308   - formatter: '{b}<br />{a0}: {c0}'
  308 + formatter: '{b}<br />{a0}: {c0}%'
309 309 },
310 310 // // 图例组件
311 311 // legend: {
... ... @@ -364,29 +364,31 @@ this.drawsTwo(zhutu.data)
364 364 // 坐标轴刻度标签
365 365 axisLabel: {
366 366 show: true, // 是否显示刻度标签 默认显示
367   - fontSize: 14, // 文字的字体大小
  367 + fontSize: 16, // 文字的字体大小
368 368 color: '#cdd3ee', // 刻度标签文字的颜色
369 369 // 使用字符串模板，模板变量为刻度默认标签 {value}
370 370 formatter: '{value}'
371 371 },
372 372 // 类目数据，在类目轴（type: 'category'）中有效
373   - data: lo.names.reverse()
  373 + data: arr.map(item => item.name)
374 374 }
375 375 ],
376 376 // 系列列表
377   - series: [{
378   - type: 'bar', // 系列类型
379   - name: '已消费',
380   - barMaxWidth: 20, // 柱条的最大宽度，不设时自适应
381   - // label: {
382   - // show: true,
383   - // position: "inside"
384   - // },
385   - itemStyle: {
386   - barBorderRadius: [10, 0, 0, 10] // 圆角半径, 单位px, 支持传入数组分别指定 4 个圆角半径
387   - },
388   - data: lo.rates.reverse() // 系列中的数据内容数组
389   - }]
  377 + series: [
  378 + {
  379 + type: 'bar', // 系列类型
  380 + name: '已完成',
  381 + barMaxWidth: 20, // 柱条的最大宽度，不设时自适应
  382 + // label: {
  383 + // show: true,
  384 + // position: "inside"
  385 + // },
  386 + itemStyle: {
  387 + barBorderRadius: [10, 0, 0, 10] // 圆角半径, 单位px, 支持传入数组分别指定 4 个圆角半径
  388 + },
  389 + data:arr.map(item => item.value)// 系列中的数据内容数组
  390 + }
  391 + ]
390 392 }
391 393  
392 394 myEchart.setOption(option)
... ...
merchant-web-master/src/views/comprehensive/psRanking/index.vue
  View file @9683c4a
... ... @@ -3,7 +3,7 @@
3 3 <div style="background-color:#F2F3F5">
4 4 <div class="history">
5 5 <div style="background-color:#Fff;padding:20px 20px 0 20px">
6   - <div style="font-size:14px;">商品销售排行</div>
  6 +
7 7 <!-- 顶部搜索 -->
8 8 <div class="toolbar">
9 9 <el-form ref="formParams" :inline="true" :model="formParams">
... ... @@ -56,9 +56,9 @@
56 56 {{scope.row.product.shopGroupName}}
57 57 </template>
58 58 </el-table-column>
59   - <el-table-column prop="sx" label="属性" >
  59 + <el-table-column prop="sx" label="属性" show-overflow-tooltip>
60 60 <template slot-scope="scope">
61   - {{scope.row.products[0].value}}
  61 + {{scope.row.product.productBrief}}
62 62 </template>
63 63 </el-table-column>
64 64 <el-table-column prop="createTime" label="商品创建时间">
... ... @@ -72,10 +72,10 @@
72 72 </div>
73 73 <!-- 分页 -->
74 74 <div class="fenye">
75   - <div style="line-height: 34px">显示第1到第10条记录</div>
  75 +
76 76 <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
77   - :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total,sizes,prev, pager,next" :total="total "
78   - @size-change="handleSizeChange" @current-change="handleCurrentChange" />
  77 + layout="total,prev, pager,next" :total="total "
  78 + @current-change="handleCurrentChange" />
79 79 </div>
80 80 </div>
81 81 </div>
... ... @@ -90,7 +90,7 @@
90 90 export default {
91 91 data() {
92 92 return {
93   - total: 1,
  93 + total: 0,
94 94 pageSize: 10,
95 95 currentPage: 1,
96 96 formParams: {
... ... @@ -123,14 +123,14 @@ async getAll(){
123 123 const res = await orderGetAll(this.formInline)
124 124 const Orderlist = await salesRanking(res.data.list)
125 125 this.tableData = Orderlist.data
126   -
  126 +this.total = Orderlist.data.length
127 127 },
128 128 async search(){
129 129 this.formInline.dates = this.formParams.dates
130 130 const res = await orderGetAll(this.formInline)
131 131 const Orderlist = await salesRanking(res.data.list)
132 132 this.tableData = Orderlist.data
133   - console.log(Orderlist.data)
  133 + this.total = Orderlist.data.length
134 134 },
135 135 clear(){
136 136 this.formParams.dates =[]
... ...
merchant-web-master/src/views/stockControl/inventory/index.vue
  View file @9683c4a
... ... @@ -83,6 +83,12 @@
83 83 </template>
84 84 </el-table-column>
85 85 <el-table-column prop="reject" label="驳回原因" show-overflow-tooltip />
  86 + <el-table-column prop="registrationStatus" label="登记状态" show-overflow-tooltip>
  87 + <template slot-scope="scope">
  88 + <span v-if="scope.row.registrationStatus==''">未入库</span>
  89 + <span v-if="scope.row.registrationStatus==1">已入库</span>
  90 + </template>
  91 + </el-table-column>
86 92 <el-table-column prop="createTime" label="创建时间" width="180" />
87 93 <el-table-column label="操作" width="200">
88 94 <template slot-scope="scope">
... ... @@ -91,6 +97,7 @@
91 97 <div v-if="scope.row.shelveState==0" class="tableBtn greens" @click="down(scope.row)">上架</div>
92 98 <div v-if="scope.row.shelveState==1" class="tableBtn greens" @click="down(scope.row)">下架</div>
93 99 <div v-if="scope.row.combinationId != '' && scope.row.stockNumber != 0" class="tableBtn greens" @click="chaiFen(scope.row)" >拆分</div>
  100 + <div @click="setVipPrice(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens" >设置会员价</div>
94 101 <div v-if="scope.row.shelveState!=1" class="tableBtn greens" @click="del(scope.row)">删除</div>
95 102 </div>
96 103 </template>
... ... @@ -146,6 +153,78 @@
146 153 :message="parentMessage"
147 154 />
148 155 </el-dialog>
  156 + <!-- 设置会员价弹窗 -->
  157 + <el-dialog
  158 + title="设置会员价"
  159 + :visible.sync="vipPriceVisible"
  160 + width="50%"
  161 + class="vipDialog"
  162 + >
  163 + <el-form ref="form" label-width="80px">
  164 + <el-form-item label="优惠方式">
  165 + <el-radio-group v-model="mode" @change="modeChange">
  166 + <el-radio :label="1">折扣</el-radio>
  167 + <el-radio :label="2">指定价格</el-radio>
  168 + </el-radio-group>
  169 + </el-form-item>
  170 + <div class="priceTable">
  171 + <table>
  172 + <tr>
  173 + <th>规格</th>
  174 + <th>售价</th>
  175 + <th v-for="(item,index) in gradeList" :key="index">
  176 + {{ item }}
  177 + </th>
  178 + </tr>
  179 + <tr v-for="(item,index) in productData" :key="index">
  180 + <td>
  181 + {{ item.value }}
  182 + </td>
  183 + <td>
  184 + {{ item.price }}
  185 + </td>
  186 + <td v-for="(itemJ,indexJ) in item.memberPrices" :key="indexJ" class="td-input">
  187 + <el-input v-model="itemJ.price" oninput="value=value.replace(/([^\d|\.])/g, '')" /> {{ mode==1?'折':'元' }}
  188 + </td>
  189 + </tr>
  190 + </table>
  191 + </div>
  192 + <el-button type="success" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
  193 + </el-form>
  194 + <span slot="footer" class="dialog-footer">
  195 + <el-button @click="vipPriceVisible = false">取 消</el-button>
  196 + <el-button type="primary" @click="vipPriceSubmit">确 定</el-button>
  197 + </span>
  198 + </el-dialog>
  199 + <el-dialog
  200 + title="入库登记"
  201 + :visible.sync="rukuShow"
  202 + width="60%"
  203 + class="vipDialog"
  204 + >
  205 + <el-form ref="form" label-width="80px">
  206 + <el-form-item label="商品名称">
  207 + <el-select v-model="shopId" filterable placeholder="请选择">
  208 + <el-option
  209 + v-for="item in tableData"
  210 + :key="item.productId"
  211 + :label="item.productName"
  212 + :value="item.productId">
  213 + </el-option>
  214 + </el-select>
  215 + </el-form-item>
  216 + <el-form-item label="是否登记">
  217 + <el-radio-group v-model="dengjiMsg" >
  218 + <el-radio label="1">是</el-radio>
  219 + <el-radio label="">否</el-radio>
  220 + </el-radio-group>
  221 + </el-form-item>
  222 + </el-form>
  223 + <span slot="footer" class="dialog-footer">
  224 + <el-button @click="rukuShow = false">取 消</el-button>
  225 + <el-button type="primary" @click="rukuCheck">确 定</el-button>
  226 + </span>
  227 + </el-dialog>
149 228 </div>
150 229 </template>
151 230  
... ... @@ -164,7 +243,8 @@ import {
164 243 setProductMember,
165 244 productExport,
166 245 getBrandList,
167   - chFen
  246 + chFen,
  247 + getClassifyUpdate
168 248 } from '@/api/commodity'
169 249 export default {
170 250 components: {
... ... @@ -197,11 +277,19 @@ export default {
197 277 commId: 0,
198 278 brandList: [],
199 279 zuheNum:0,
200   - teble_sel:false,
  280 +
201 281 parentMessage: '这是父组件传递给子组件的消息',
202 282 canst:'' ,//组合商品ID
203 283 index:1,
204   - dengji:[]
  284 + dengji:[],
  285 + vipPriceVisible: false,
  286 + mode: 1,
  287 + productData: [],
  288 + gradeList: [],
  289 + teble_sel:false,
  290 + rukuShow:false,
  291 + dengjiMsg:'',
  292 + shopId:''
205 293 }
206 294 },
207 295 computed: {
... ... @@ -454,8 +542,95 @@ export default {
454 542 },
455 543 //入库登记
456 544 rukdengji(){
457   - this.teble_sel = true
458   - this.index = 1
  545 + this.rukuShow = true
  546 +
  547 + },
  548 + // 设置会员价
  549 + setVipPrice(row) {
  550 + var _ = this
  551 + this.productId = row.productId
  552 + getProductMembers({ productId: row.productId }).then(res => {
  553 + if (res.code === '') {
  554 + _.productData = res.data
  555 + if (_.productData && _.productData.length > 0) {
  556 + _.gradeList = []
  557 + const _memberPrices = _.productData[0].memberPrices
  558 + _memberPrices.forEach(function(item, i) {
  559 + _.gradeList.push(item.memberLevelName)
  560 + })
  561 + _.mode = _.productData[0].mode ? _.productData[0].mode : 1
  562 + _.vipPriceVisible = true
  563 + }
  564 + }
  565 + })
  566 + },
  567 + // 设置会员价提交
  568 + vipPriceSubmit() {
  569 + for (let i = 0; i < this.productData.length; i++) {
  570 + this.productData[i].mode = this.mode
  571 + for (let j = 0; j < this.productData[i].memberPrices.length; j++) {
  572 + this.productData[i].memberPrices[j].mode = this.mode
  573 + var _price = this.productData[i].memberPrices[j].price
  574 + if (!_price) {
  575 + this.$message({
  576 + type: 'warning',
  577 + message: '会员价格不能为空！'
  578 + })
  579 + return false
  580 + } else if (this.productData[i].mode === 1) {
  581 + if (_price <= 0 || _price >= 10) {
  582 + this.$message({
  583 + type: 'warning',
  584 + message: '会员折数必须大于0小于10！'
  585 + })
  586 + return false
  587 + }
  588 + } else if (this.productData[i].mode === 2) {
  589 + if (_price > this.productData[i].price) {
  590 + this.$message({
  591 + type: 'warning',
  592 + message: '会员价格不能大于原价！'
  593 + })
  594 + return false
  595 + }
  596 + }
  597 + }
  598 + }
  599 + setProductMember({ productId: this.productId, members: this.productData }).then(res => {
  600 + if (res.code === '') {
  601 + this.$message({
  602 + type: 'success',
  603 + message: '设置成功!'
  604 + })
  605 + this.getAll(this.formInline)
  606 + this.vipPriceVisible = false
  607 + }
  608 + })
  609 + },
  610 + // 清空会员价
  611 + clearProductMember() {
  612 + console.log(this.productData, 'this.productData')
  613 + this.$confirm('该商品所有旧设置的会员价将被清除, 是否继续？', '提示', {
  614 + confirmButtonText: '确定',
  615 + cancelButtonText: '取消',
  616 + type: 'warning'
  617 + }).then(() => {
  618 + clearProductMember({ productId: this.productId }).then(res => {
  619 + if (res.code === '') {
  620 + this.productData.map(item => {
  621 + item.memberPrices.map(itemChild => {
  622 + itemChild.price = null
  623 + })
  624 + })
  625 + this.$message.success('清除成功')
  626 + // this.vipPriceVisible = false
  627 + }
  628 + })
  629 + })
  630 + },
  631 + async rukuCheck(){
  632 + await getClassifyUpdate({productId:this.shopId,registrationStatus:this.dengjiMsg})
  633 + this.$message.success('保存成功')
459 634 }
460 635 }
461 636 }
... ...
yanshouban/src/utils/request.js
  View file @9683c4a
... ... @@ -21,9 +21,9 @@ if (host == &#39;172.16.61.48&#39; || host == &#39;172.16.61.49:5173&#39; || host ==&#39;172.16.61.1
21 21 // PREFIX = 'http://172.16.61.48/meserver/admin-server';
22 22 // PREFIX = 'http://8.130.38.56:9003';
23 23 // PREFIX = 'http://8.130.38.56:8019/admin-server';
24   - PREFIX = 'http://192.168.2.193:9003';
  24 + // PREFIX = 'http://192.168.2.193:9003';
25 25 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
26   - // PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
  26 + PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
27 27 // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
28 28 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'
29 29  
... ...
yanshouban/src/views/ads/fangAudit/bianform.vue
  View file @9683c4a
... ... @@ -66,7 +66,7 @@
66 66 </div>
67 67 </div>
68 68 <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
69   - <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="steat == false && ruleForm.attachmentInfo">{{ruleForm.attachmentInfo.name}}</div>
  69 + <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>
70 70 <!-- <a style="margin-left:20px;color:#3F9B6A" :href="ruleForm.attachmentInfo.url" target="_blank" v-if="ruleForm.attachmentInfo.name">下载</a> -->
71 71 <!-- <el-upload class="upload-demo" ref="upload" :on-preview="handlePreview" :on-remove="handleRemove"
72 72 :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
... ... @@ -191,13 +191,14 @@ guihuaDate:[],
191 191 watch: {
192 192 'list': {
193 193 handler(newValue) {
  194 +
194 195 // 当 list 发生变化时，更新 secondData
195 196 this.ruleForm = { ...newValue };
196   - console.log(this.ruleForm)
197   - if ( this.ruleForm.attachmentInfo != '') {
198   - // this.ruleForm.attachmentInfo = JSON.parse(this.ruleForm.attachmentInfo)
199   - this.fileData.push(this.ruleForm.attachmentInfo)
200   - }
  197 +
  198 + if ( this.ruleForm.attachmentInfo != '' && typeof this.ruleForm.attachmentInfo === 'string') {
  199 + this.ruleForm.attachmentInfo = JSON.parse(this.ruleForm.attachmentInfo)
  200 +
  201 + }
201 202 // if(this.ruleForm.resourceManagement !=''){
202 203 // this.ruleForm.resourceManagement = JSON.parse(this.ruleForm.resourceManagement)
203 204 // }
... ...
yanshouban/src/views/ads/fangAudit/index.vue
  View file @9683c4a
... ... @@ -524,7 +524,8 @@
524 524 </div>
525 525 <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
526 526  
527   - <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="shenhe.attachmentInfo &&shenhe.attachmentInfo.name">{{shenhe.attachmentInfo.name}}</div>
  527 +
  528 + <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>
528 529  
529 530 </el-form-item>
530 531  
... ... @@ -598,7 +599,7 @@ export default {
598 599 pageindex: {
599 600 pageNumber: 1,
600 601 pageSize: 10,
601   - auditStatus:'1'
  602 +
602 603 },
603 604 chart: null,
604 605 chart1: null,
... ...
yanshouban/src/views/ads/fangli/addform.vue
  View file @9683c4a
... ... @@ -254,7 +254,7 @@
254 254 </div>
255 255 </el-dialog>
256 256 <!-- 模板管理 -->
257   - <el-dialog title="模板管理" :visible.sync="ModeShow" custom-class='bian_css' style="padding: 0;" width="65%"
  257 + <!-- <el-dialog title="模板管理" :visible.sync="ModeShow" custom-class='bian_css' style="padding: 0;" width="65%"
258 258 center :close-on-click-modal="false" append-to-body>
259 259 <div style="padding:20px;">
260 260 <div>
... ... @@ -274,7 +274,7 @@
274 274 <template slot-scope="scope">
275 275 <div @click="modeXian(scope.row)" class="tableBtn greens">选择模板</div>
276 276 <div @click="modeXian(scope.row)" class="tableBtn greens">查看</div>
277   - <!-- <div @click="addM(2,scope.row)" class="tableBtn greens">编辑</div> -->
  277 +
278 278 <div @click="" class="tableBtn greens">删除</div>
279 279 </template>
280 280 </el-table-column>
... ... @@ -354,7 +354,7 @@
354 354 </div>
355 355  
356 356 </el-dialog>
357   - </el-dialog>
  357 + </el-dialog> -->
358 358  
359 359 </div>
360 360  
... ... @@ -506,10 +506,11 @@ multipleSelection:[],
506 506  
507 507 const fileMsg = {
508 508 name:file.name,
509   - url:response.data,
  509 + url:response.data.url,
510 510 }
511 511 // 将文件地址存储在 uploadedFiles 数组中
512   - this.fileData.push(fileMsg);
  512 + this.fileData.push(fileMsg)
  513 +
513 514 },
514 515 handleRemove(file, fileList) {
515 516 this.fileData = []
... ...
yanshouban/src/views/ads/fangli/bianform.vue
  View file @9683c4a
... ... @@ -79,10 +79,9 @@
79 79 :auto-upload="true" v-if="steat">
80 80 <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover" v-if="fileData.length ==0">+点击上传</el-button>
81 81 </el-upload>
82   -<!-- <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> -->
83 82  
84   - <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="steat == false && ruleForm.attachmentInfo">{{ruleForm.attachmentInfo.name}}</div>
85   - <!-- <a style="margin-left:20px;color:#3F9B6A" :href="ruleForm.attachmentInfo.url" target="_blank" v-if="ruleForm.attachmentInfo.name">下载</a> -->
  83 +<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>
  84 +
86 85 </el-form-item>
87 86 </el-form>
88 87 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
... ... @@ -363,7 +362,7 @@ guihuaDate:[],
363 362  
364 363 const fileMsg = {
365 364 name:file.name,
366   - url: response.data,
  365 + url: response.data.url,
367 366 }
368 367 // 将文件地址存储在 uploadedFiles 数组中
369 368 this.fileData.push(fileMsg);
... ...
yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue
  View file @9683c4a
... ... @@ -57,8 +57,7 @@
57 57 {{scope.$index + 1 }}
58 58 </template>
59 59 </el-table-column>
60   - <el-table-column label="编号" min-width="150" prop="id">
61   - </el-table-column>
  60 +
62 61 <el-table-column label="所属端" min-width="150" v-if="leixing == 1">
63 62 <template slot-scope="scope">
64 63 {{scope.row.cereAdvertisingInformation.affiliation}}
... ... @@ -84,11 +83,8 @@
84 83  
85 84  
86 85 </el-table-column>
87   - <el-table-column label="投放定价" prop="tenant" min-width="150">
88   - <template slot-scope="scope">
89   - {{scope.row.rotationOrde}}
  86 + <el-table-column label="投放定价" prop="cpc" min-width="150">
90 87  
91   - </template>
92 88 </el-table-column>
93 89  
94 90  
... ... @@ -672,28 +668,27 @@
672 668 <template slot="label">
673 669 合同签订日期
674 670 </template>
675   - <el-input
676   - v-model="heForm.contractSigningDate"
677   - class="pass_input"
678   - placeholder="请输入"/>
  671 +
  672 + <el-date-picker v-model="heForm.contractSigningDate"
  673 + value-format="yyyy-MM-dd" type="date" placeholder="请选择" prefix-icon="none" style="border:none">
  674 + </el-date-picker>
679 675 </el-descriptions-item>
680 676 <el-descriptions-item>
681 677 <template slot="label">
682 678 合同终止日期
683 679 </template>
684   - <el-input
685   - v-model="heForm.contractTerminationDate"
686   - class="pass_input"
687   - placeholder="请输入"/>
  680 +
  681 + <el-date-picker v-model="heForm.contractTerminationDate"
  682 + value-format="yyyy-MM-dd" type="date" placeholder="请选择" prefix-icon="none" style="border:none">
  683 + </el-date-picker>
688 684 </el-descriptions-item>
689 685 <el-descriptions-item>
690 686 <template slot="label">
691 687 起止日期
692 688 </template>
693   - <el-input
694   - v-model="heForm.leaseStartDate"
695   - class="pass_input"
696   - placeholder="请输入"/>
  689 + <el-date-picker v-model="heForm.leaseStartDate"
  690 + value-format="yyyy-MM-dd" type="date" placeholder="请选择" prefix-icon="none" style="border:none">
  691 + </el-date-picker>
697 692 </el-descriptions-item>
698 693 <el-descriptions-item>
699 694 <template slot="label">
... ... @@ -925,7 +920,8 @@
925 920 auditReminderTime:'',
926 921 },
927 922 peiShow:false,
928   - peiId:''
  923 + peiId:'',
  924 + hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount','tenantName','tenantTelephone','tenantBankAccount'],
929 925 }
930 926 },
931 927 created() {
... ... @@ -1223,7 +1219,8 @@ heCheck(){
1223 1219 if(this.hetongData.length !=0){
1224 1220 this.heForm.appendicesContract = JSON.stringify(this.hetongData[0])
1225 1221 }
1226   - hetongadd(this.heForm).then(res=>{
  1222 + let heinfo = this.$decryptall(this.heForm,this.hemiList)
  1223 + hetongadd(heinfo).then(res=>{
1227 1224 AdvertiserInfoEdit({
1228 1225 id: this.secondData.id,
1229 1226 contractId:res.data.id,
... ...
yanshouban/src/views/advertisement/index.vue
  View file @9683c4a
... ... @@ -91,7 +91,7 @@
91 91 </template>
92 92 </el-table-column>
93 93  
94   - <el-table-column label="操作" min-width="350">
  94 + <el-table-column label="操作" min-width="350" fixed="right">
95 95 <template slot-scope="scope">
96 96 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
97 97 <div @click="lookHetong(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus !='5'">合同编辑</div>
... ... @@ -102,7 +102,7 @@
102 102 <div class="tableBtn greens" v-if="scope.row.auditStatus =='1'" @click="peizhi(scope.row)">
103 103 审核流程配置
104 104 </div>
105   - <div @click="gengGai(scope.row)" class="tableBtn greens" v-if="leixing == 1&& scope.row.auditStatus !='5'">更改状态</div>
  105 + <div @click="gengGai(scope.row)" class="tableBtn greens" v-if="leixing == 2&& scope.row.auditStatus !='5'">更改状态</div>
106 106 <div @click="handleDelete(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='1'">删除</div>
107 107 <!-- <div @click="handleDelete(scope.row)" class="tableBtn greens" >删除</div> -->
108 108 </template>
... ... @@ -1090,13 +1090,23 @@
1090 1090 if (contentLength > 0) {
1091 1091 // 获取最后一个元素并赋值给 this.hetong
1092 1092 this.hetong = res.data.content[contentLength - 1]
  1093 + this.hetong.bankAccount =this.$decrypt(this.hetong.bankAccount)
  1094 + this.hetong.contractAmount =this.$decrypt(this.hetong.contractAmount)
  1095 + this.hetong.dataIntegrity =this.$decrypt(this.hetong.dataIntegrity)
  1096 + this.hetong.earnestMoney =this.$decrypt(this.hetong.earnestMoney)
  1097 + this.hetong.lessorName =this.$decrypt(this.hetong.lessorName)
  1098 + this.hetong.telephone =this.$decrypt(this.hetong.telephone)
  1099 + this.hetong.tenantName =this.$decrypt(this.hetong.tenantName)
  1100 +
1093 1101 }
1094 1102 this.hetongBox = true
  1103 + console.log(this.hetong)
1095 1104 },
1096 1105 //编辑合同
1097 1106 async EditHetong(val){
1098 1107 this.hetong.updateDate = ''
1099   - await hetongEdit(this.hetong)
  1108 + let heinfo = this.$decryptall(this.hetong,this.hemiList)
  1109 + await hetongEdit(heinfo)
1100 1110 this.hetongBox = false
1101 1111 this.getTable(this.chengeTatle)
1102 1112 },
... ... @@ -1110,13 +1120,25 @@
1110 1120 this.formSel.online = '实体广告位'
1111 1121 this.pageindex.scopeDeployment= '实体广告位'
1112 1122 }
1113   - contractGetAll(this.formSel).then(res=>{
  1123 + let obj = JSON.parse(JSON.stringify(this.formSel))
  1124 + obj.cereContractInformation.tenantName= this.$encrypt(obj.cereContractInformation.tenantName)
  1125 + contractGetAll(obj).then(res=>{
1114 1126 if(this.pageindex.scopeDeployment == '线上广告位'){
1115 1127 this.xsNum = res.data.content.length
1116 1128 }else{
1117 1129 this.stNum = res.data.content.length
1118 1130 }
1119 1131 this.tableData = res.data.content
  1132 + this.tableData.map(res=>{
  1133 + res.cereContractInformation.earnestMoney =this.$decrypt(res.cereContractInformation.earnestMoney)
  1134 + res.cereContractInformation.contractAmount =this.$decrypt(res.cereContractInformation.contractAmount)
  1135 + res.cereContractInformation.lessorName =this.$decrypt(res.cereContractInformation.lessorName)
  1136 + res.cereContractInformation.telephone =this.$decrypt(res.cereContractInformation.telephone)
  1137 + res.cereContractInformation.bankAccount =this.$decrypt(res.cereContractInformation.bankAccount)
  1138 + res.cereContractInformation.tenantName =this.$decrypt(res.cereContractInformation.tenantName)
  1139 + res.cereContractInformation.tenantTelephone =this.$decrypt(res.cereContractInformation.tenantTelephone)
  1140 + res.cereContractInformation.tenantBankAccount =this.$decrypt(res.cereContractInformation.tenantBankAccount)
  1141 + })
1120 1142 this.total = res.data.content.length
1121 1143 })
1122 1144 // const res = await contractGetAll(this.pageindex)
... ... @@ -1193,13 +1215,62 @@
1193 1215 childFujian(msg){
1194 1216 this.fileData = msg
1195 1217 },
1196   - async toufang(item){
1197   - await updateList({id:item.id,auditStatus:'4'})
1198   - this.getAll()
  1218 + toufang(item){
  1219 +
  1220 + const h = this.$createElement;
  1221 + this.$msgbox({
  1222 + title: '消息',
  1223 + message: h('p', null, [
  1224 + h('span', null, '是否投放 '),
  1225 + ]),
  1226 + showCancelButton: true,
  1227 + showClose:false,
  1228 + confirmButtonText: '确定',
  1229 + cancelButtonText: '取消',
  1230 + customClass:'oe-dialog-btn',
  1231 + beforeClose: (action, instance, done) => {
  1232 + if (action === 'confirm') {
  1233 + updateList({id:item.id,auditStatus:'4'}).then(res=>{
  1234 + this.getAll()
  1235 + done();
  1236 + })
  1237 +
  1238 + } else {
  1239 + done();
  1240 + }
  1241 + }
  1242 + })
  1243 +
  1244 +
  1245 +
1199 1246 },
1200   - async xiajia(item){
1201   - await updateList({id:item.id,auditStatus:'2'})
1202   - this.getAll()
  1247 + xiajia(item){
  1248 + const h = this.$createElement;
  1249 + this.$msgbox({
  1250 + title: '消息',
  1251 + message: h('p', null, [
  1252 + h('span', null, '是否下架 '),
  1253 + ]),
  1254 + showCancelButton: true,
  1255 + showClose:false,
  1256 + confirmButtonText: '确定',
  1257 + cancelButtonText: '取消',
  1258 + customClass:'oe-dialog-btn',
  1259 + beforeClose: (action, instance, done) => {
  1260 + if (action === 'confirm') {
  1261 + updateList({id:item.id,auditStatus:'2'}).then(res=>{
  1262 + this.getAll()
  1263 + done();
  1264 + })
  1265 +
  1266 + } else {
  1267 + done();
  1268 + }
  1269 + }
  1270 + })
  1271 +
  1272 +
  1273 +
1203 1274 },
1204 1275 async status(){
1205 1276 await updateList({id:this.secondData.id,auditStatus:'5'})
... ...
yanshouban/src/views/customer/rsaManagement/index.vue
  View file @9683c4a
... ... @@ -326,7 +326,7 @@
326 326 ">
327 327 匹配记录
328 328 </div>
329   - <div style="padding: 0 20px">
  329 + <div style="padding: 0 20px;" >
330 330 <div style="
331 331 display: flex;
332 332 justify-content: space-between;
... ... @@ -336,9 +336,9 @@
336 336 <el-form ref="form" :inline="true" :model="pipeiSel" style="padding-top: 10px;">
337 337 <el-form-item label="意向资源类型">
338 338 <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择" style="width:168px">
339   - <el-option label="商铺" value="sp" />
340   - <el-option label="广告位" value="gg" />
341   - <el-option label="场地" value="cd" />
  339 + <el-option label="商铺" value="商铺" />
  340 + <el-option label="广告位" value="广告位" />
  341 + <el-option label="场地" value="场地" />
342 342 </el-select>
343 343  
344 344 </el-form-item>
... ... @@ -371,29 +371,37 @@
371 371 <el-button style="background-color: #3F9B6A;color: #fff"
372 372 >导出</el-button>
373 373 </div> -->
374   - <el-table :data="
375   - pipData.slice(
376   - (currentPage - 1) * pageSize,
377   - currentPage * pageSize
378   - )
379   - " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  374 + <el-table :data="pipData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" style="max-height:500px;overflow: auto;">
380 375 <el-table-column label="序号" min-width="80">
381 376 <template slot-scope="scope">
382 377 {{scope.$index+1}}
383 378 </template>
384 379 </el-table-column>
385   - <el-table-column label="资源名称" prop="intentCustomerName" min-width="150" />
  380 + <!-- <el-table-column label="资源名称" prop="intentCustomerName" min-width="150" /> -->
386 381 <el-table-column label="编号" prop="resourcesId" min-width="150" />
387   - <el-table-column label="意向资源类型" prop="shopName" min-width="150" />
388   - <el-table-column label="最近释放日期" prop="businessStartTime" min-width="150" />
389   - <el-table-column label="最短租期" prop="contactInformation" min-width="150" />
390   - <el-table-column label="意向租金单价(元/平方)" prop="contactInformation" min-width="250" />
391   - <el-table-column prop="auditStatus" label="资源状态" min-width="150">
  382 + <el-table-column label="意向资源类型" min-width="150">
392 383 <template slot-scope="scope">
393   -
  384 + {{ scope.row.resources.cereRentalPolicies.businessType }}
  385 + </template>
  386 + </el-table-column>
  387 + <!-- <el-table-column label="最近释放日期" prop="businessStartTime" min-width="150" /> -->
  388 + <el-table-column label="最短租期" prop="contactInformation" min-width="150" >
  389 + <template slot-scope="scope">
  390 + {{ scope.row.resources.cereRentalPolicies.leaseTerm }}
  391 + </template>
  392 + </el-table-column>
  393 + <el-table-column label="意向租金单价(元/平方)" prop="contactInformation" min-width="250">
  394 + <template slot-scope="scope">
  395 + {{ scope.row.resources.cereRentalPolicies.rentalPrice }}
394 396 </template>
395 397 </el-table-column>
396 398  
  399 + <!-- <el-table-column prop="auditStatus" label="资源状态" min-width="150">
  400 + <template slot-scope="scope">
  401 + {{ scope.row.cereRentalPolicies.rentalPrice }}
  402 + </template>
  403 + </el-table-column> -->
  404 +
397 405 </el-table>
398 406 </div>
399 407 </el-dialog>
... ... @@ -1059,6 +1067,17 @@ async getshen(item){
1059 1067 this.multipleSelection =[]
1060 1068 },
1061 1069 pipei(item){
  1070 + this.pipeiSel={
  1071 + resources:{
  1072 +         cereRentalPolicies:{
  1073 +             businessType:'',
  1074 +             leaseTerm:'',
  1075 +             rentalPrice:''
  1076 +         }
  1077 +     },
  1078 + pageNumber:1,
  1079 + pageSize:100,
  1080 + }
1062 1081 this.pip = true
1063 1082 this.pipData = []
1064 1083 },
... ... @@ -1072,11 +1091,11 @@ async getshen(item){
1072 1091  
1073 1092 },
1074 1093 pipeiBtn(){
1075   - if(this.pipeiSel.resources.cereRentalPolicies.businessType == 'sp'){
  1094 + if(this.pipeiSel.resources.cereRentalPolicies.businessType == '商铺'){
1076 1095 this.pipeiSel.resourcesId = 'sp'
1077   - }else if(this.pipeiSel.resources.cereRentalPolicies.businessType == 'cd'){
  1096 + }else if(this.pipeiSel.resources.cereRentalPolicies.businessType == '场地'){
1078 1097 this.pipeiSel.resourcesId = 'cd'
1079   - }else{
  1098 + }else if(this.pipeiSel.resources.cereRentalPolicies.businessType == '广告位'){
1080 1099 this.pipeiSel.resourcesId = 'gg'
1081 1100 }
1082 1101 ziyuanduiy(this.pipeiSel).then(res=>{
... ... @@ -1094,7 +1113,7 @@ async getshen(item){
1094 1113     },
1095 1114 resourcesId:'',
1096 1115 pageNumber:1,
1097   - pageSize:10,
  1116 + pageSize:100,
1098 1117 },
1099 1118 this.pipData = []
1100 1119 },
... ...
yanshouban/src/views/detect/addziyuan.vue
  View file @9683c4a
... ... @@ -630,11 +630,6 @@
630 630 message: '请输入详细位置',
631 631 trigger: 'blur'
632 632 }, ],
633   - displayMainImage: [{
634   - required: true,
635   - message: '请上传主图',
636   - trigger: 'blur'
637   - }, ],
638 633 belongingGreenwaySection: [{
639 634 required: true,
640 635 message: '请选择所属绿道段',
... ...
yanshouban/src/views/detect/admap.vue
  View file @9683c4a
... ... @@ -250,8 +250,15 @@
250 250 <el-table-column label="详细位置" min-width="6%" prop="detailedLocation" v-if="activeName == 'third'">
251 251 </el-table-column>
252 252 <el-table-column label="租赁状态" min-width="6%" v-if="activeName == 'third'">
  253 + <template slot-scope="scope">
  254 + {{scope.row.rentalStatus == 0?'未租':'已租'}}
  255 + </template>
  256 +
253 257 </el-table-column>
254 258 <el-table-column label="发布状态" min-width="6%" v-if="activeName == 'third'">
  259 + <template slot-scope="scope">
  260 + {{scope.row.publishStatus == 0?'待发布':'已提交'}}
  261 + </template>
255 262 </el-table-column>
256 263 <el-table-column label="操作" width="auto" min-width="10%" v-if="activeName == 'third'">
257 264 <template slot-scope="scope" fixed="right">
... ... @@ -264,12 +271,7 @@
264 271 </el-table>
265 272  
266 273 </el-tab-pane>
267   - <div class="fenye">
268 274  
269   - <el-pagination class="pagination" :hide-on-single-page="flag" background small
270   - :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" layout="total,prev, pager,next"
271   - :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
272   - </div>
273 275 <!-- <el-tab-pane label="临铺" name="fourth">
274 276 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
275 277 :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
... ... @@ -292,7 +294,12 @@
292 294 </el-table>
293 295 </el-tab-pane> -->
294 296 </el-tabs>
  297 +<div class="fenye">
295 298  
  299 + <el-pagination class="pagination" :hide-on-single-page="flag" background
  300 + :current-page="currentPage" layout="total,prev, pager,next"
  301 + :total="total" @current-change="handleCurrentChange" />
  302 + </div>
296 303 </div>
297 304 </div>
298 305 </div>
... ... @@ -1870,6 +1877,8 @@ lvdaoList:[]
1870 1877 this.parentMessage = res.data.content
1871 1878 const lvdao = await lvdaoduan()
1872 1879 this.lvdaoList = lvdao.data
  1880 + this.total = res.data.content.length
  1881 +
1873 1882 },
1874 1883 //查询全数据
1875 1884 async getAll() {
... ... @@ -1944,6 +1953,7 @@ lvdaoList:[]
1944 1953 this.setzulin(res.data.content)
1945 1954 this.parentMessage = res.data.content
1946 1955 this.total = res.data.content.length
  1956 + this.currentPage = 1
1947 1957 } else if (event == 'second') {
1948 1958 // this.pageindex.advertisingType = '实体广告位'
1949 1959 const res = await getAllMap(this.pageindex)
... ... @@ -1951,12 +1961,14 @@ lvdaoList:[]
1951 1961 this.setzulin(res.data.content)
1952 1962 this.tableData = res.data.content
1953 1963 this.total = res.data.content.length
  1964 + this.currentPage = 1
1954 1965 } else if (event == 'third') {
1955 1966 const res = await changAlls(this.pageindex)
1956 1967 this.tableData = res.data.content
1957 1968 this.setzulin(res.data.content)
1958 1969 this.parentMessage = res.data.content
1959 1970 this.total = res.data.content.length
  1971 + this.currentPage = 1
1960 1972 } else if (event == 'fourth') {
1961 1973 this.parentMessage = []
1962 1974 this.tableData = []
... ...
yanshouban/src/views/detect/ziyuanList.vue
  View file @9683c4a
... ... @@ -411,11 +411,7 @@
411 411 message: '请输入详细位置',
412 412 trigger: []
413 413 }, ],
414   - displayMainImage: [{
415   - required: true,
416   - message: '请上传主图',
417   - trigger: []
418   - }, ],
  414 +
419 415 belongingGreenwaySection: [{
420 416 required: true,
421 417 message: '请选择所属绿道段',
... ...
yanshouban/src/views/ipm/inr/index.vue
  View file @9683c4a
... ... @@ -290,8 +290,8 @@
290 290 :auto-upload="true" v-if="steat == false">
291 291 <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover" v-if="fileData.length ==0">+点击上传</el-button>
292 292 </el-upload>
  293 +<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>
293 294  
294   - <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="steat&&secondData.otherAttachments ">{{secondData.otherAttachments.name}}</div>
295 295 </el-form-item>
296 296 <el-form-item label="现场照片">
297 297 <upimg v-model="formInline.onSitePhotos" :limit="1" :fileSize="1" :isShowTip="false" v-if="steat ==false"></upimg>
... ...
yanshouban/src/views/rent/audit/index.vue
  View file @9683c4a
... ... @@ -1372,6 +1372,18 @@
1372 1372 </template>
1373 1373 <el-input v-model="formInline.orderNumber" placeholder="请输入" style="width:100%;" />
1374 1374 </el-descriptions-item>
  1375 + <el-descriptions-item>
  1376 + <template slot="label">
  1377 + 商户名称
  1378 + </template>
  1379 + <el-input v-model="formInline.leaseName" placeholder="请输入" style="width:100%;" />
  1380 + </el-descriptions-item>
  1381 + <el-descriptions-item>
  1382 + <template slot="label">
  1383 + 租赁类型
  1384 + </template>
  1385 + <el-input v-model="formInline.leaseType" placeholder="请输入" style="width:100%;" />
  1386 + </el-descriptions-item>
1375 1387 </el-descriptions>
1376 1388 </div>
1377 1389 <div class="xinxiInput">
... ... @@ -1417,19 +1429,25 @@
1417 1429 <template slot="label">
1418 1430 合同签订日期
1419 1431 </template>
1420   - <el-input v-model="heForm.contractSigningDate" placeholder="请输入" style="width:100%;" />
  1432 + <el-date-picker v-model="heForm.contractSigningDate"
  1433 + value-format="yyyy-MM-dd" type="date" placeholder="请选择" prefix-icon="none">
  1434 + </el-date-picker>
1421 1435 </el-descriptions-item>
1422 1436 <el-descriptions-item>
1423 1437 <template slot="label">
1424 1438 合同终止日期
1425 1439 </template>
1426   - <el-input v-model="heForm.contractTerminationDate" placeholder="请输入" style="width:100%;" />
  1440 + <el-date-picker v-model="heForm.contractTerminationDate"
  1441 + value-format="yyyy-MM-dd" type="date" placeholder="请选择" prefix-icon="none">
  1442 + </el-date-picker>
1427 1443 </el-descriptions-item>
1428 1444 <el-descriptions-item>
1429 1445 <template slot="label">
1430 1446 起租日期
1431 1447 </template>
1432   - <el-input v-model="heForm.leaseStartDate" placeholder="请输入" style="width:100%;" />
  1448 + <el-date-picker v-model="heForm.leaseStartDate"
  1449 + value-format="yyyy-MM-dd" type="date" placeholder="请选择" prefix-icon="none">
  1450 + </el-date-picker>
1433 1451 </el-descriptions-item>
1434 1452 <el-descriptions-item>
1435 1453 <template slot="label">
... ... @@ -1471,8 +1489,8 @@
1471 1489 <template slot="label">
1472 1490 商铺编号
1473 1491 </template>
1474   - {{heForm.shopNumber}}
1475   - <!-- <el-input v-model="heForm.shopNumber" placeholder="请输入" style="width:100%;" disabled /> -->
  1492 +
  1493 + <el-input v-model="heForm.shopNumber" placeholder="请输入" style="width:100%;" disabled />
1476 1494 </el-descriptions-item>
1477 1495 <el-descriptions-item>
1478 1496 <template slot="label">
... ... @@ -1656,6 +1674,7 @@
1656 1674 rentalResourcesId:'',
1657 1675 businessPurpose:'',
1658 1676 auditStatus:'',
  1677 +
1659 1678 },
1660 1679 secondData: {},
1661 1680 shenheMsg:{
... ... @@ -1720,7 +1739,8 @@ contractNumber: &#39;&#39;, //合同对应的ID
1720 1739 ziyuanData:[],
1721 1740 multipleSelection:[],
1722 1741 selData:[],
1723   - miList:['idNumber','unifiedSocialCreditCode','legalRepresentative','residence','emailAddress']
  1742 + miList:['idNumber','unifiedSocialCreditCode','legalRepresentative','residence','emailAddress'],
  1743 + hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount','tenantName','tenantTelephone','tenantBankAccount'],
1724 1744 }
1725 1745 },
1726 1746  
... ... @@ -1934,7 +1954,7 @@ contractNumber: &#39;&#39;, //合同对应的ID
1934 1954 contractStatus: '', //合同状态
1935 1955 dataStatus: '1', //数据状态（1.使用中 2.往期合同 3.已终止）
1936 1956 }
1937   - this.heForm.shopNumber = item.rentalResourcesId
  1957 + this.heForm.shopNumber = item.cereBasicInformationShop.venueNumber || item.cereBasicInformationVenue.venueNumber
1938 1958 this.heForm.relatedMerchants = item.applicant
1939 1959  
1940 1960 this.luheShow = true
... ... @@ -1960,14 +1980,15 @@ contractNumber: &#39;&#39;, //合同对应的ID
1960 1980 this.luheShow = false
1961 1981 },
1962 1982 hecheck(){
1963   -
1964 1983 if(this.hefuData.length !=0){
1965 1984 this.heForm.appendicesContract = JSON.stringify(this.hefuData[0])
1966 1985 }
1967   - contractAdd(this.heForm).then(res => {
  1986 +let heinfo = this.$decryptall(this.heForm,this.hemiList)
  1987 + contractAdd(heinfo).then(res => {
1968 1988 msgedit({auditStatus:'4',id:this.secondData.id,contractNumber:res.data.contractNumber})
1969 1989 this.formInline.contractNumber = res.data.contractNumber
1970 1990 this.formInline.createDate = this.currentTime()
  1991 + this.formInline.rentalCondition = '1'
1971 1992 cereLeasingAdd(this.formInline).then(res => {
1972 1993 this.getAll()
1973 1994 })
... ...
yanshouban/src/views/scheme/addressguan.vue
  View file @9683c4a
... ... @@ -13,7 +13,7 @@
13 13 </el-input>
14 14 </div>
15 15 <div>
16   - <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
  16 + <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查看
17 17 </el-button>
18 18 <el-button @click="resetting" class="buttonHover"
19 19 style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
... ... @@ -70,7 +70,7 @@
70 70 </div>
71 71 </el-dialog>
72 72 <el-button @click="quxiao()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
73   - class="buttonHover">取 消</el-button>
  73 + class="buttonHover">返回</el-button>
74 74 </div>
75 75 </template>
76 76  
... ...
yanshouban/src/views/scheme/planningBz.vue
  View file @9683c4a
... ... @@ -284,7 +284,7 @@
284 284 <el-col :span="24">
285 285 <el-form-item label="招商规划方案上传">
286 286 <!-- <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="xiangqing==1" @click="yulanFu(secondData.annex)">{{secondData.annex.name}}</div> -->
287   - <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>
  287 + <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>
288 288 <el-upload class="upload-demo" ref="upload" :action="upload" :on-preview="handlePreview" v-else
289 289 :on-success="handleSuccess"
290 290 :on-remove="handleRemove" :file-list="fileList" :auto-upload="true" :on-change="handleChange">
... ... @@ -570,9 +570,13 @@ this.total = res.data.content.length
570 570  
571 571 })
572 572 }
  573 +
573 574 if(this.fileList.length !=0){
574 575 this.secondData.annex = JSON.stringify(this.fileList[0])
  576 + }else{
  577 + this.secondData.annex = ''
575 578 }
  579 +
576 580 updateList(this.secondData).then(res => {
577 581 this.$message({
578 582 message: '保存成功',
... ...
yanshouban/src/views/scheme/planningPar.vue
  View file @9683c4a
... ... @@ -378,7 +378,7 @@
378 378  
379 379 <el-form-item label="招商规划方案上传">
380 380  
381   - <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>
  381 + <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>
382 382  
383 383 </el-form-item>
384 384  
... ... @@ -572,7 +572,7 @@
572 572 <el-col :span="24">
573 573 <el-form-item label="招商规划方案上传">
574 574 <!-- <div style="padding:10px 0;line-height:20px;color:#3F9B6A" @click="yulanFu(secondData.annex)">{{secondData.annex.name}}</div> -->
575   - <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>
  575 + <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>
576 576  
577 577  
578 578 </el-form-item>
... ... @@ -641,7 +641,6 @@
641 641 pageindex: {
642 642 pageNumber: 1,
643 643 pageSize: 10,
644   - reviewStatus:'1'
645 644 },
646 645 fileList: [],
647 646 ggXinShow:true,
... ...
yanshouban/src/views/scheme/samXin.vue
  View file @9683c4a
... ... @@ -431,10 +431,6 @@
431 431 message: '请输入租金价格'
432 432 },
433 433 {
434   - type: 'number',
435   - message: '必须为数字值'
436   - },
437   - {
438 434 validator: (rule, value, callback) => {
439 435 if (value <= 0) {
440 436 callback(new Error('租金价格必须大于0'));
... ...
yanshouban/src/views/shopRental/manage/index.vue
  View file @9683c4a
... ... @@ -119,8 +119,8 @@
119 119 <template slot-scope="scope">
120 120 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
121 121 <div @click="addbuss(2,scope.row)" class="tableBtn greens" v-if="scope.row.cereContractInformation.dataStatus==1">编辑</div>
122   - <div @click="biangeng(scope.row)" class="tableBtn greens">变更</div>
123   - <div @click="xuyue(scope.row)" class="tableBtn greens" >续约</div>
  122 + <div @click="biangeng(scope.row)" class="tableBtn greens" v-if="scope.row.cereContractInformation.dataStatus==1">变更</div>
  123 + <div @click="xuyue(scope.row)" class="tableBtn greens" v-if="scope.row.cereContractInformation.dataStatus==1">续约</div>
124 124 <div @click="zhongzhi(scope.row)" class="tableBtn greens" v-if="scope.row.cereContractInformation.dataStatus==1">终止</div>
125 125 <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
126 126 </template>
... ... @@ -360,7 +360,7 @@
360 360 <div v-if="index ==2">{{heForm.contractSigningDate}}</div>
361 361 <!-- <el-input v-model="heForm.contractSigningDate" style="width:100%;" v-else placeholder="请输入"/> -->
362 362 <el-date-picker v-model="heForm.contractSigningDate"
363   - value-format="yyyy-MM-dd HH:mm:ss" type="datetime" v-else placeholder="请选择" prefix-icon="none">
  363 + value-format="yyyy-MM-dd" type="date" v-else placeholder="请选择" prefix-icon="none">
364 364 </el-date-picker>
365 365 </el-descriptions-item>
366 366 <el-descriptions-item>
... ... @@ -370,7 +370,7 @@
370 370 <div v-if="index ==2">{{heForm.contractTerminationDate}}</div>
371 371 <!-- <el-input v-model="heForm.contractTerminationDate" style="width:100%;" v-else placeholder="请输入"/> -->
372 372 <el-date-picker v-model="heForm.contractTerminationDate"
373   - value-format="yyyy-MM-dd HH:mm:ss" type="datetime" v-else placeholder="请选择" prefix-icon="none">
  373 + value-format="yyyy-MM-dd" type="date" v-else placeholder="请选择" prefix-icon="none">
374 374 </el-date-picker>
375 375 </el-descriptions-item>
376 376 <el-descriptions-item>
... ... @@ -380,7 +380,7 @@
380 380 <div v-if="index ==2">{{heForm.leaseStartDate}}</div>
381 381 <!-- <el-input v-model="heForm.leaseStartDate" style="width:100%;" v-else placeholder="请输入"/> -->
382 382 <el-date-picker v-model="heForm.leaseStartDate"
383   - value-format="yyyy-MM-dd HH:mm:ss" type="datetime" v-else placeholder="请选择" prefix-icon="none">
  383 + value-format="yyyy-MM-dd" type="date" v-else placeholder="请选择" prefix-icon="none">
384 384 </el-date-picker>
385 385 </el-descriptions-item>
386 386 <el-descriptions-item>
... ... @@ -578,7 +578,7 @@
578 578 <div style="display: flex;justify-content: flex-end;">
579 579 <el-button @click="xuyueShow=false" class="buttonHover"
580 580 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
581   - <el-button @click="xuyueShow=false" style="background-color: #3F9B6A;color: #fff">确定</el-button>
  581 + <el-button @click="xuyueCheck" style="background-color: #3F9B6A;color: #fff">确定</el-button>
582 582 </div>
583 583 </div>
584 584 </el-dialog>
... ... @@ -633,7 +633,7 @@
633 633 <div style="display: flex;justify-content: flex-end;">
634 634 <el-button @click="biangengShow=false" class="buttonHover"
635 635 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
636   - <el-button @click="xuyueShow=false" style="background-color: #3F9B6A;color: #fff">确定</el-button>
  636 + <el-button @click="biangenCheck" style="background-color: #3F9B6A;color: #fff">确定</el-button>
637 637 </div>
638 638 </div>
639 639 <el-dialog :visible.sync="bianAddShow" custom-class="bian_css" style="padding: 0;" width="50%" center
... ... @@ -1454,6 +1454,14 @@ hemiList:[&#39;earnestMoney&#39;,&#39;contractAmount&#39;,&#39;lessorName&#39;,&#39;telephone&#39;,&#39;bankAccount&#39;
1454 1454 if(this.hefuData.length!=0){
1455 1455 this.heForm.appendicesContract = JSON.stringify(this.hefuData[0])
1456 1456 }
  1457 +
  1458 +
  1459 + if(this.hefuData.length!=0){
  1460 + this.heForm.planeFigure = JSON.stringify(this.pingimgData[0])
  1461 + }
  1462 + if(this.hefuData.length!=0){
  1463 + this.heForm.promotionImage = JSON.stringify(this.xuanimgData[0])
  1464 + }
1457 1465 this.heForm.createDate = this.currentTime()
1458 1466 let heinfo = this.$decryptall(this.heForm,this.hemiList)
1459 1467 contractAdd(heinfo).then(res => {
... ... @@ -1467,6 +1475,9 @@ hemiList:[&#39;earnestMoney&#39;,&#39;contractAmount&#39;,&#39;lessorName&#39;,&#39;telephone&#39;,&#39;bankAccount&#39;
1467 1475 } else if (val == 2) {
1468 1476 this.heForm.updateDate = ''
1469 1477 this.heForm.createDate = this.currentTime()
  1478 + if(typeof this.heForm.appendicesContract == 'object'){
  1479 + this.heForm.appendicesContract = JSON.stringify(this.heForm.appendicesContract)
  1480 + }
1470 1481 let heinfo = this.$decryptall(this.heForm,this.hemiList)
1471 1482 updateList(heinfo).then(res=>{
1472 1483 this.formInline.contractNumber = res.data.contractNumber
... ... @@ -1542,7 +1553,8 @@ hemiList:[&#39;earnestMoney&#39;,&#39;contractAmount&#39;,&#39;lessorName&#39;,&#39;telephone&#39;,&#39;bankAccount&#39;
1542 1553 details(val) {
1543 1554 this.xiangData = val
1544 1555 this.heData = val.cereContractInformation
1545   - if(typeof this.heData.appendicesContract == 'string'){
  1556 +
  1557 + if(typeof this.heData.appendicesContract == 'string' && this.heData.appendicesContract != ''){
1546 1558 this.heData.appendicesContract = JSON.parse(this.heData.appendicesContract)
1547 1559 }
1548 1560  
... ... @@ -1588,7 +1600,9 @@ hemiList:[&#39;earnestMoney&#39;,&#39;contractAmount&#39;,&#39;lessorName&#39;,&#39;telephone&#39;,&#39;bankAccount&#39;
1588 1600 promotionImage: '',
1589 1601 notes: '',
1590 1602 rentalCondition:0,
  1603 +
1591 1604 }//租赁信息字段
  1605 +
1592 1606 this.heForm={
1593 1607 contractNumber: '', //合同对应的ID
1594 1608 sectionNumber: '',
... ... @@ -1618,6 +1632,10 @@ hemiList:[&#39;earnestMoney&#39;,&#39;contractAmount&#39;,&#39;lessorName&#39;,&#39;telephone&#39;,&#39;bankAccount&#39;
1618 1632 contractStatus: '', //合同状态
1619 1633 dataStatus: '1', //数据状态（1.使用中 2.往期合同 3.已终止）
1620 1634 } //合同字段
  1635 + this.pingimgData =[]
  1636 + this.videoData=[]
  1637 + this.xuanimgData=[]
  1638 + this.hefuData=[]
1621 1639 } else if (val == 2) {
1622 1640 this.heForm = item.cereContractInformation
1623 1641 const { cereContractInformation, ...rest } = item
... ... @@ -1709,7 +1727,9 @@ this.ggXin = true
1709 1727 this.zhong.contractNumber = item.cereContractInformation.contractNumber
1710 1728 this.zhong.leaseStartDate = item.cereContractInformation.leaseStartDate
1711 1729 this.zhong.tenantTelephone = item.cereContractInformation.tenantTelephone
  1730 +
1712 1731 this.zhong.id= item.cereContractInformation.id
  1732 +
1713 1733 },
1714 1734 xuyue(item) {
1715 1735 this.xuyueShow = true
... ... @@ -1719,12 +1739,14 @@ this.ggXin = true
1719 1739 this.xuyueData.leaseStartDate = item.cereContractInformation.leaseStartDate
1720 1740 this.xuyueData.contractAmount = item.cereContractInformation.contractAmount
1721 1741 this.xuyueData.tenantTelephone = item.cereContractInformation.tenantTelephone
  1742 + this.xuyueData.id= item.cereContractInformation.id
1722 1743 },
1723 1744 biangeng(item) {
1724 1745 this.biangengShow = true
1725 1746 this.biangengData.lessorName = item.cereContractInformation.lessorName
1726 1747 this.biangengData.tenantName= item.cereContractInformation.tenantName
1727 1748 this.biangengData.contractNumber = item.cereContractInformation.contractNumber
  1749 + this.biangengData.id= item.cereContractInformation.id
1728 1750 },
1729 1751 bianAdd() {
1730 1752 this.bianList={
... ... @@ -1793,6 +1815,21 @@ this.ggXin = true
1793 1815  
1794 1816 this.bianAddShow =false
1795 1817 },
  1818 + async zhongCheck(){
  1819 + await updateList({id:this.zhong.id,dataStatus:'3'})
  1820 + this.getAll()
  1821 + this.zhongzhiShow = false
  1822 + },
  1823 +
  1824 + biangenCheck(){
  1825 +
  1826 + // await updateList({id:this.biangengData.id,dataStatus:'3'})
  1827 + this.biangengShow = false
  1828 + },
  1829 + async xuyueCheck(){
  1830 + await updateList({id:this.xuyueData.id ,rentalCondition:'3'})
  1831 + this.xuyueShow = false
  1832 + },
1796 1833 bianEdit(item){
1797 1834 this.biangengPan = true
1798 1835 this.bianList = item
... ... @@ -1821,16 +1858,12 @@ this.ggXin = true
1821 1858  
1822 1859 })
1823 1860 })
1824   -
1825   - this.daoIndex = 1
  1861 +this.fileData =[]
  1862 + // this.daoIndex = 1
1826 1863 }
1827 1864  
1828 1865  
1829 1866 },
1830   - async zhongCheck(){
1831   - await updateList({id:this.zhong.id,dataStatus:'3'})
1832   - this.zhongzhiShow = false
1833   - }
1834 1867  
1835 1868 }
1836 1869 }
... ...
yanshouban/src/views/shopRental/rentalMan/index.vue
  View file @9683c4a
... ... @@ -564,152 +564,28 @@
564 564 </el-descriptions-item>
565 565 <el-descriptions-item>
566 566 <template slot="label">
567   - 状态
  567 + 订单编号
568 568 </template>
569   - <span v-if="bianZt">{{xiangData.state}}</span>
570   - <el-input v-model="xiangData.state" placeholder="请输入" style="width:100%;" v-else/>
571   - </el-descriptions-item>
572   - </el-descriptions>
573   - </div>
574   - <div style="">
575   - <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
576   - :contentStyle="contentStyle">
577   - <el-descriptions-item>
578   - <template slot="label">
579   - 租赁类型
580   - </template>
581   - <span v-if="bianZt">{{xiangData.leaseType}}</span>
582   - <el-input v-model="xiangData.leaseType" placeholder="请输入" style="width:100%;" v-else/>
583   - </el-descriptions-item>
584   - <el-descriptions-item>
585   - <template slot="label">
586   - 编号
587   - </template>
588   - <span v-if="bianZt">{{xiangData.leaseCode}}</span>
589   - <el-input v-model="xiangData.leaseCode" placeholder="请输入" style="width:100%;" v-else/>
590   - </el-descriptions-item>
591   - <el-descriptions-item>
592   - <template slot="label">
593   - 名称
594   - </template>
595   - <span v-if="bianZt">{{xiangData.leaseName}}</span>
596   - <el-input v-model="xiangData.leaseName" placeholder="请输入" style="width:100%;" v-else/>
597   - </el-descriptions-item>
598   - <el-descriptions-item>
599   - <template slot="label">
600   - 行政区
601   - </template>
602   - <span v-if="bianZt">{{xiangData.administrativeRegion}}</span>
603   - <el-input v-model="xiangData.administrativeRegion" placeholder="请输入" style="width:100%;" v-else/>
  569 + <span v-if="bianZt">{{xiangData.orderNumber}}</span>
  570 + <el-input v-model="xiangData.orderNumber" placeholder="请输入" style="width:100%;" v-else/>
604 571 </el-descriptions-item>
605 572 <el-descriptions-item>
606 573 <template slot="label">
607   - 地址
  574 + 商户名称
608 575 </template>
609   - <span v-if="bianZt">{{xiangData.leaseAddress}}</span>
610   - <el-input v-model="xiangData.leaseAddress" placeholder="请输入" style="width:100%;" v-else/>
  576 + <span v-if="bianZt">{{xiangData.leaseName}}</span>
  577 + <el-input v-model="xiangData.leaseName" placeholder="请输入" style="width:100%;" v-else/>
611 578 </el-descriptions-item>
612 579 <el-descriptions-item>
613 580 <template slot="label">
614   - 所属主体
615   - </template>
616   - <span v-if="bianZt">{{xiangData.owner}}</span>
617   - <el-input v-model="xiangData.owner" placeholder="请输入" style="width:100%;" v-else/>
618   - </el-descriptions-item>
619   - <el-descriptions-item>
620   - <template slot="label">
621   - 负责人
622   - </template>
623   - <span v-if="bianZt">{{xiangData.commander}}</span>
624   - <el-input v-model="xiangData.commander" placeholder="请输入" style="width:100%;" v-else/>
625   - </el-descriptions-item>
626   - <el-descriptions-item>
627   - <template slot="label">
628   - 联系电话
629   - </template>
630   - <span v-if="bianZt">{{xiangData.telephone}}</span>
631   - <el-input v-model="xiangData.telephone" placeholder="请输入" style="width:100%;" v-else/>
632   - </el-descriptions-item>
633   - <el-descriptions-item>
634   - <template slot="label">
635   - 范围
636   - </template>
637   - <span v-if="bianZt">{{xiangData.scope}}</span>
638   - <el-input v-model="xiangData.scope" placeholder="请输入" style="width:100%;" v-else/>
639   - </el-descriptions-item>
640   - <el-descriptions-item>
641   - <template slot="label">
642   - 面积
643   - </template>
644   - <span v-if="bianZt">{{xiangData.area}}</span>
645   - <el-input v-model="xiangData.area" placeholder="请输入" style="width:100%;" v-else/>
646   - </el-descriptions-item>
647   - <el-descriptions-item>
648   - <template slot="label">
649   - 建成时间
650   - </template>
651   - <span v-if="bianZt">{{xiangData.completionTime}}</span>
652   - <el-input v-model="xiangData.completionTime" placeholder="请输入" style="width:100%;" v-else/>
653   - </el-descriptions-item>
654   - <el-descriptions-item>
655   - <template slot="label">
656   - 房屋类型
657   - </template>
658   - <span v-if="bianZt">{{xiangData.houseType}}</span>
659   - <el-input v-model="xiangData.houseType" placeholder="请输入" style="width:100%;" v-else/>
660   - </el-descriptions-item>
661   - <el-descriptions-item>
662   - <template slot="label">
663   - 主要设施
664   - </template>
665   - <span v-if="bianZt">{{xiangData.mainFacilities}}</span>
666   - <el-input v-model="xiangData.mainFacilities" placeholder="请输入" style="width:100%;" v-else/>
667   - </el-descriptions-item>
668   - <el-descriptions-item>
669   - <template slot="label">
670   - 平面图
671   - </template>
672   - <span v-if="bianZt">{{xiangData.planeFigure}}</span>
673   - <el-input v-model="xiangData.planeFigure" placeholder="请输入" style="width:100%;" v-else/>
674   - </el-descriptions-item>
675   - <el-descriptions-item>
676   - <template slot="label">
677   - 收费标准
678   - </template>
679   - <span v-if="bianZt">{{xiangData.feeStandards}}</span>
680   - <el-input v-model="xiangData.feeStandards" placeholder="请输入" style="width:100%;" v-else/>
681   - </el-descriptions-item>
682   - <el-descriptions-item>
683   - <template slot="label">
684   - 标签
685   - </template>
686   - <span v-if="bianZt">{{xiangData.label}}</span>
687   - <el-input v-model="xiangData.label" placeholder="请输入" style="width:100%;" v-else/>
688   - </el-descriptions-item>
689   -
690   - <el-descriptions-item>
691   - <template slot="label">
692   - 宣传视频
693   - </template>
694   - <span v-if="bianZt">{{xiangData.promotionVideo}}</span>
695   - <el-input v-model="xiangData.promotionVideo" placeholder="请输入" style="width:100%;" v-else/>
696   - </el-descriptions-item>
697   - <el-descriptions-item>
698   - <template slot="label">
699   - 宣传图片
700   - </template>
701   - <span v-if="bianZt">{{xiangData.promotionImage}}</span>
702   - <el-input v-model="xiangData.promotionImage" placeholder="请输入" style="width:100%;" v-else/>
703   - </el-descriptions-item>
704   - <el-descriptions-item>
705   - <template slot="label">
706   - 备注信息
  581 + 租赁类型
707 582 </template>
708   - <span v-if="bianZt">{{xiangData.notes}}</span>
709   - <el-input v-model="xiangData.notes" placeholder="请输入" style="width:100%;" v-else/>
  583 + <span v-if="bianZt">{{xiangData.leaseType}}</span>
  584 + <el-input v-model="xiangData.leaseType" placeholder="请输入" style="width:100%;" v-else/>
710 585 </el-descriptions-item>
711 586 </el-descriptions>
712 587 </div>
  588 +
713 589 <div style="font-size: 14px;padding: 20px 0;color: #000;">合同信息</div>
714 590 <div>
715 591 <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
... ... @@ -718,8 +594,8 @@
718 594 <template slot="label">
719 595 合同编号
720 596 </template>
721   - <div v-if="bianZt">{{heData.contractNumber}}</div>
722   - <el-input v-model="heData.contractNumber" style="width:100%;" v-else placeholder="请输入"/>
  597 + <div>{{heData.contractNumber}}</div>
  598 +
723 599 </el-descriptions-item>
724 600 <el-descriptions-item>
725 601 <template slot="label">
... ... @@ -991,13 +867,9 @@
991 867 excelRentOutQueryByPage,
992 868 pdfRentOutQueryByPage
993 869 } from '../../../api/rentalMan.js'
994   -import {
995   - businessListSave,
996   - businessListGetById,
997   - businessListUpdate,
998   - businessListStart,
999   - delBusinessById
1000   -} from '@/api/business'
  870 + import {
  871 + updateList
  872 + } from '../../../api/manage.js'
1001 873 import upimg from "@/components/ImageUpload/index"
1002 874 import wangEditor from "@/components/editor/index"
1003 875 import html2canvas from 'html2canvas'
... ... @@ -1087,6 +959,8 @@ import {
1087 959 height:'42px',
1088 960 color:'#000',
1089 961 },
  962 + miList:['telephone','commander','leaseAddress','administrativeRegion','operator','tenant' ],
  963 + hemiList:['earnestMoney','contractAmount','lessorName','telephone','bankAccount','tenantName','tenantTelephone','tenantBankAccount'],
1090 964 }
1091 965 },
1092 966 created() {
... ... @@ -1120,8 +994,8 @@ import {
1120 994 res.commander = this.$decrypt(res.commander)
1121 995 res.leaseAddress = this.$decrypt(res.leaseAddress)
1122 996 res.administrativeRegion = this.$decrypt(res.administrativeRegion)
1123   - res.operator = this.$decrypt(res.operator)
1124   - res.tenant = this.$decrypt(res.tenant)
  997 + // res.operator = this.$decrypt(res.operator)
  998 + // res.tenant = this.$decrypt(res.tenant)
1125 999 res.cereContractInformation.earnestMoney =this.$decrypt(res.cereContractInformation.earnestMoney)
1126 1000 res.cereContractInformation.contractAmount =this.$decrypt(res.cereContractInformation.contractAmount)
1127 1001 res.cereContractInformation.lessorName =this.$decrypt(res.cereContractInformation.lessorName)
... ... @@ -1158,6 +1032,7 @@ import {
1158 1032 details(val,item){
1159 1033 this.xiangData = item
1160 1034 this.heData = item.cereContractInformation
  1035 + console.log(item)
1161 1036 if(val == 1){
1162 1037 this.bianZt = false
1163 1038 }else{
... ... @@ -1168,16 +1043,30 @@ import {
1168 1043  
1169 1044 },
1170 1045 addbuss(val,item) {
1171   - this.index = val
1172   - this.detbox = false
1173   - this.ggXin = true
1174   - this.zhong.lessorName = item.cereContractInformation.lessorName
1175   - this.zhong.tenantName = item.cereContractInformation.tenantName
1176   - this.zhong.leaseAddress = item.leaseAddress
1177   - this.zhong.leaseName = item.leaseName
1178   - this.zhong.completionTime = item.completionTime
1179   - this.zhong.intendedLeaseTerm = item.intendedLeaseTerm
1180   - this.zhong.intentionalRent = item.intentionalRent
  1046 + this.index = val
  1047 + if(val == 2){
  1048 + this.detbox = false
  1049 + this.heData.createDate =''
  1050 + delete this.heData.updateDate
  1051 + let heinfo = this.$decryptall(this.heData,this.hemiList)
  1052 + updateList(heinfo).then(res=>{
  1053 + this.xiangData.contractNumber = res.data.contractNumber
  1054 + delete this.xiangData.updateDate
  1055 + let newinfo = this.$decryptall(this.xiangData,this.miList)
  1056 + cereLeasingEdit(newinfo).then(item=>{
  1057 +
  1058 + })
  1059 + })
  1060 + }else{
  1061 + this.ggXin = true
  1062 + this.zhong.lessorName = item.cereContractInformation.lessorName
  1063 + this.zhong.tenantName = item.cereContractInformation.tenantName
  1064 + this.zhong.leaseAddress = item.leaseAddress
  1065 + this.zhong.leaseName = item.leaseName
  1066 + this.zhong.completionTime = item.completionTime
  1067 + this.zhong.intendedLeaseTerm = item.intendedLeaseTerm
  1068 + this.zhong.intentionalRent = item.intentionalRent
  1069 + }
1181 1070 },
1182 1071 handleSizeChange(val) {
1183 1072 this.pageSize = val
... ...
yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
  View file @9683c4a
... ... @@ -22,6 +22,9 @@
22 22 <u-form-item label="链接" prop="redirectUrl" borderBottom>
23 23 <u-input v-model="model1.redirectUrl"></u-input>
24 24 </u-form-item>
  25 + <u-form-item label="投放定价" prop="cpc" borderBottom>
  26 + <u-input v-model="model1.cpc"></u-input>
  27 + </u-form-item>
25 28 </view>
26 29 <view class="add-list">
27 30 <u-form-item label="封面图片" prop="coverImage" borderBottom labelPosition="top">
... ... @@ -33,7 +36,7 @@
33 36 <u-input v-model="model1.adTitle" />
34 37 </u-form-item>
35 38 </view>
36   -
  39 +
37 40 </u-form>
38 41 </view>
39 42  
... ... @@ -200,6 +203,7 @@
200 203 redirectUrl: '',
201 204 coverImage: '',
202 205 adTitle: '',
  206 + cpc:'',
203 207 subjectName: '',
204 208 unifiedSocialCreditCode: '',
205 209 type: '',
... ...
yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss
  View file @9683c4a
... ... @@ -51,8 +51,8 @@
51 51 margin-bottom: 30rpx;
52 52 }
53 53 .info-racord {
54   - display: flex;
55   - justify-content: space-between;
  54 + // display: flex;
  55 + // justify-content: space-between;
56 56 align-items: center;
57 57 .info-price {
58 58 color: #31AA6A;
... ...
yslvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
  View file @9683c4a
... ... @@ -7,8 +7,8 @@
7 7 </view>
8 8 <view class="info-text">{{tableData.shopDescription}}</view>
9 9 <view class="info-racord">
10   - <view class="info-price"><span>1000</span>元/月</view>
11   - <view class="info-intention">2456人有意向</view>
  10 + <view class="info-price" v-for="(item,index) in celueList"><span>{{item.rentalPrice}}</span>元/{{item.leaseTerm}}</view>
  11 + <!-- <view class="info-intention">2456人有意向</view> -->
12 12 </view>
13 13 </view>
14 14 <view class="banner-item field">
... ... @@ -99,11 +99,17 @@ export default {
99 99 ],
100 100 latitude: 39.909,
101 101 longitude: 116.39742,
  102 + celueList:[]
102 103 };
103 104 },
104 105 onLoad(option){
105 106 let data = JSON.parse(option.item)
  107 + console.log(option)
106 108 this.tableData = data;
  109 + if(option.celue != ''){
  110 + let celue = JSON.parse(option.celue)
  111 + this.celueList = celue
  112 + }
107 113 },
108 114 methods: {
109 115 leaseAdd(url){
... ...
yslvdao-miniapp/pages/details/details.scss
  View file @9683c4a
... ... @@ -57,8 +57,8 @@
57 57 margin-bottom: 30rpx;
58 58 }
59 59 .info-racord {
60   - display: flex;
61   - justify-content: space-between;
  60 + // display: flex;
  61 + // justify-content: space-between;
62 62 align-items: center;
63 63 .info-price {
64 64 color: #31AA6A;
... ...
yslvdao-miniapp/pages/details/details.vue
  View file @9683c4a
... ... @@ -11,8 +11,8 @@
11 11 </view>
12 12 <view class="info-text">{{tableData.shopDescription}}</view>
13 13 <view class="info-racord">
14   - <view class="info-price"><span>{{tableData.id *160}}</span>元/月</view>
15   - <view class="info-intention">{{tableData.id}}人有意向</view>
  14 + <view class="info-price" v-for="(item,index) in celueList"><span>{{item.rentalPrice}}</span>元/{{item.leaseTerm}}</view>
  15 + <!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
16 16 </view>
17 17 </view>
18 18 <view class="banner-item field">
... ... @@ -120,12 +120,20 @@ export default {
120 120 latitude: 39.909,
121 121 longitude: 116.39742,
122 122 qianzui:'',
  123 + celueList:[]
123 124 };
124 125 },
125 126 onLoad(option){
126 127  
127 128 let data = JSON.parse(option.item)
128   - console.log(data)
  129 +
  130 + if(option.celue != ''){
  131 + let celue = JSON.parse(option.celue)
  132 + this.celueList = celue
  133 + }
  134 +
  135 +
  136 +
129 137 if(data.shopName){
130 138 this.qianzui = 'sp'
131 139 }else{
... ...
yslvdao-miniapp/pages/home/home.vue
  View file @9683c4a
... ... @@ -228,15 +228,15 @@
228 228 <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
229 229 <view v-for="(item, index) in tableData" :key="index" class="scroll-view-item_H" @click="details(item)">
230 230 <view class="business-card">
231   - <u-image :showLoading="true" :src="item.displayMainImage || item.locationDiagram || item.displayImage" width="100%" height="210rpx"></u-image>
  231 + <u-image :showLoading="true" :src="item.cereBasicInformationShop.displayMainImage || item.cereAdvertisingInformation.locationDiagram || item.cereBasicInformationVenue.displayImage" width="100%" height="210rpx"></u-image>
232 232 <view class="business-card-title">
233   - {{ item.shopName || item.advertisingName || item.venueName}}
  233 + {{ item.cereBasicInformationShop.shopName || item.cereAdvertisingInformation.advertisingName || item.cereBasicInformationVenue.venueName}}
234 234 </view>
235   - <view class="business-card-item">租金：￥<span>{{item.id * 10}}</span>/月</view>
236   - <view class="business-card-item">面积：<span>{{item.actualUsableArea?item.actualUsableArea:'55.4'}}</span>/m2</view>
237   - <view class="introduce" v-if='item.detailedLocation'>
  235 + <view class="business-card-item">租金：￥<span>{{item.cereReleasePoliciesVO[0].rentalPrice}}</span>/{{item.cereReleasePoliciesVO[0].leaseTerm}}</view>
  236 + <view class="business-card-item">面积：<span>{{item.cereBasicInformationShop.actualUsableArea?item.cereBasicInformationShop.actualUsableArea:'55.4'}}</span>/m2</view>
  237 + <view class="introduce" v-if='item.cereBasicInformationShop.detailedLocation ||item.cereBasicInformationVenue.detailedLocation'>
238 238 <image :src="$imgUrl('/kefu.png')"></image>
239   - <text class="one-omit">{{item.detailedLocation}}</text>
  239 + <text class="one-omit">{{item.cereBasicInformationShop.detailedLocation ||item.cereBasicInformationVenue.detailedLocation}}</text>
240 240 </view>
241 241 </view>
242 242 </view>
... ... @@ -255,7 +255,7 @@
255 255 <view class="business-card">
256 256 <u-image :showLoading="true" :src="item.coverImage" width="100%" height="210rpx"></u-image>
257 257 <view class="business-card-title">
258   - {{item.activityName}}
  258 + {{item.activityName || '默认'}}
259 259 </view>
260 260 <view class="huo-card-item">创建时间：<span>{{item.startTime}}</span></view>
261 261 <view class="huo-card-item">参与人数：<span>{{item.maxParticipants}}</span></view>
... ... @@ -412,29 +412,37 @@
412 412 onCouponTab(type) {
413 413 let pagesize = {
414 414 pageNumber: 1,
415   - pageSize: 2
  415 + pageSize: 2,
  416 + resourceType:'',
  417 + dataForm:'2'
416 418 }
417 419 this.current = type
418 420 if (type == 0) {
419   - this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', pagesize,1).then(res => {
  421 + pagesize.resourceType = '商铺'
  422 + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', pagesize,1).then(res => {
420 423 //成功回调
  424 +
421 425 this.tableData = res.data.data.content
  426 + console.log(this.tableData)
422 427 }).catch(err => {
423 428 console.log(err)
424 429 //请求失败
425 430 })
426 431 } else if (type == 1) {
427   - this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', pagesize,1).then(res => {
  432 + pagesize.resourceType = '场地'
  433 + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', pagesize,1).then(res => {
428 434 //成功回调
429 435 this.tableData = res.data.data.content
  436 +
430 437 }).catch(err => {
431 438 console.log(err)
432 439 //请求失败
433 440 })
434 441  
435 442 } else if (type == 2) {
436   - pagesize.advertisingType = '线上广告位'
437   - this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', pagesize,1).then(res => {
  443 + pagesize.resourceType = '广告位'
  444 + // pagesize.advertisingType = '线上广告位'
  445 + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', pagesize,1).then(res => {
438 446 //成功回调
439 447 this.tableData = res.data.data.content
440 448 }).catch(err => {
... ... @@ -488,16 +496,36 @@
488 496  
489 497 },
490 498 details(item) {
491   - let items = JSON.stringify(item)
492   - if(this.current == 0 || this.current == 1){
493   - uni.navigateTo({
494   - url: `/pages/details/details?item=${items}`
495   - })
496   - }else{
497   - uni.navigateTo({
498   - url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
499   - })
500   - }
  499 + let items = ''
  500 + let celue = ''
  501 + if(this.current == 0){
  502 + items = JSON.stringify(item.cereBasicInformationShop)
  503 + celue = JSON.stringify(item.cereReleasePoliciesVO)
  504 + uni.navigateTo({
  505 + url: `/pages/details/details?item=${items}&celue=${celue}`
  506 + })
  507 + }else if(this.current == 1){
  508 + items = JSON.stringify(item.cereBasicInformationVenue)
  509 + uni.navigateTo({
  510 + url: `/pages/details/details?item=${items}&celue=${celue}`
  511 + })
  512 + }else{
  513 + items = JSON.stringify(item.cereAdvertisingInformation)
  514 + celue = JSON.stringify(item.cereReleasePoliciesVO)
  515 + uni.navigateTo({
  516 + url: `/pages/advertisementDetail/advertisementDetail?item=${items}&celue=${celue}`
  517 + })
  518 + }
  519 +
  520 + // if(this.current == 0 || this.current == 1){
  521 + // uni.navigateTo({
  522 + // url: `/pages/details/details?item=${items}`
  523 + // })
  524 + // }else{
  525 + // uni.navigateTo({
  526 + // url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
  527 + // })
  528 + // }
501 529  
502 530 },
503 531 setList(val){
... ...
yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue
  View file @9683c4a
... ... @@ -316,6 +316,7 @@ getCurrentTime() {
316 316 this.model1.rentalResourcesId = this.ziyuanId
317 317 this.model1.applicant = uni.getStorageSync('shopId')
318 318 this.model1.applicationTime = this.getCurrentTime()
  319 +
319 320 this.$http.sendRequest('/cereBusinessInfo/add', 'POST', this.model1, 1).then(res => {
320 321 uni.redirectTo({
321 322 url: '/pages/record/record'
... ...
yslvdao-miniapp/utils/request.js
  View file @9683c4a
... ... @@ -14,9 +14,9 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
14 14 }
15 15 var bases = ''
16 16 if(baseUrl == 1){
17   - // bases = 'http://8.130.38.56:8027/admin-server' + url;
18   - // bases = 'http://172.16.61.48/admin-server' + url;
19 17 bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
  18 + // bases = 'http://8.130.38.56:8027/admin-server' + url;
  19 + // bases = 'http://192.168.2.193' + url;
20 20  
21 21  
22 22 }else{
... ...