webapp / GreenwayWeb

Commit 0c190439ddeb310c78fe613572c43230b7c1ddb6

Authored by 杨鑫
2 parents ba02632e c7069386

'2'

Inline Side-by-side
Showing 17 changed files with 2865 additions and 82 deletions
admin-web-master/src/components/add/addht.vue
  View file @0c19043
@@ -236,7 +236,7 @@ import { @@ -236,7 +236,7 @@ import {
236 let info = await this.culfj() 236 let info = await this.culfj()
237 console.error(info) 237 console.error(info)
238 let c1 = { 238 let c1 = {
239 - documentAddress: "http://172.16.61.237:9000" + this.templateAttachment, 239 + documentAddress: "http://172.16.10.237:19000" + this.templateAttachment,
240 insertData: JSON.stringify(info) 240 insertData: JSON.stringify(info)
241 } 241 }
242 dataInprotDocument(c1).then(res => { 242 dataInprotDocument(c1).then(res => {
@@ -329,7 +329,7 @@ import { @@ -329,7 +329,7 @@ import {
329 let info = await this.culfj() 329 let info = await this.culfj()
330 console.error(info) 330 console.error(info)
331 let c1 = { 331 let c1 = {
332 - documentAddress: "http://172.16.61.237:9000" + this.templateAttachment, 332 + documentAddress: "http://172.16.10.237:19000" + this.templateAttachment,
333 insertData: JSON.stringify(info) 333 insertData: JSON.stringify(info)
334 } 334 }
335 dataInprotDocument(c1).then(res => { 335 dataInprotDocument(c1).then(res => {
@@ -483,7 +483,7 @@ import { @@ -483,7 +483,7 @@ import {
483 let info = await this.culfj() 483 let info = await this.culfj()
484 console.error(info) 484 console.error(info)
485 let c1 = { 485 let c1 = {
486 - documentAddress: "http://172.16.61.237:9000" + this.templateAttachment, 486 + documentAddress: "http://172.16.10.237:19000" + this.templateAttachment,
487 insertData: JSON.stringify(info) 487 insertData: JSON.stringify(info)
488 } 488 }
489 dataInprotDocument(c1).then(res => { 489 dataInprotDocument(c1).then(res => {
admin-web-master/src/components/add/addmb.vue
  View file @0c19043
@@ -278,10 +278,10 @@ import { Input } from "element-ui"; @@ -278,10 +278,10 @@ import { Input } from "element-ui";
278 { 278 {
279 name: '承租人银行账号', 279 name: '承租人银行账号',
280 key: 'tenantBankAccount', 280 key: 'tenantBankAccount',
281 - type: '单行数字文本', 281 + type: '银行账号',
282 isrequired: '是', 282 isrequired: '是',
283 width: '50%（半行）', 283 width: '50%（半行）',
284 - length: '20', 284 + length: '',
285 value: '', 285 value: '',
286 }, 286 },
287 { 287 {
@@ -305,7 +305,7 @@ import { Input } from "element-ui"; @@ -305,7 +305,7 @@ import { Input } from "element-ui";
305 { 305 {
306 name: '联系电话', 306 name: '联系电话',
307 key: 'tenantTelephone', 307 key: 'tenantTelephone',
308 - type: '单行数字文本', 308 + type: '联系电话',
309 isrequired: '是', 309 isrequired: '是',
310 width: '50%（半行）', 310 width: '50%（半行）',
311 length: '20', 311 length: '20',
admin-web-master/src/components/add/addsam.vue
  View file @0c19043
@@ -30,18 +30,20 @@ @@ -30,18 +30,20 @@
30 </el-col> 30 </el-col>
31 <el-col :span="12" v-if="ruleForm.applicableResources == '商铺'"> 31 <el-col :span="12" v-if="ruleForm.applicableResources == '商铺'">
32 <el-form-item label="经营类型" prop="businessType"> 32 <el-form-item label="经营类型" prop="businessType">
33 - <el-select v-model="ruleForm.businessType" placeholder="请选择" style="width: 100%;"> 33 + <!-- <el-select v-model="ruleForm.businessType" placeholder="请选择" style="width: 100%;">
34 <el-option label="超市" value="超市" /> 34 <el-option label="超市" value="超市" />
35 <el-option label="鞋店" value="鞋店" /> 35 <el-option label="鞋店" value="鞋店" />
36 <el-option label="家居饰品店" value="家居饰品店" /> 36 <el-option label="家居饰品店" value="家居饰品店" />
37 - </el-select> 37 + </el-select> -->
  38 + <el-input v-model="ruleForm.businessType" placeholder="请输入" maxlength="50"></el-input>
38 </el-form-item> 39 </el-form-item>
  40 +
39 </el-col> 41 </el-col>
40 <el-col :span="12" v-if="ruleForm.isRental !== '0'"> 42 <el-col :span="12" v-if="ruleForm.isRental !== '0'">
41 <el-form-item label="租金价格" prop="rentalPrice"> 43 <el-form-item label="租金价格" prop="rentalPrice">
42 <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30" @input="validateNumber1('rentalPrice', $event)"> 44 <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30" @input="validateNumber1('rentalPrice', $event)">
43 - <template slot="suffix"><span  
44 - style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template> 45 + <template slot="suffix" v-if="ruleForm.applicableResources == '商铺'"><span style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
  46 + <template slot="suffix" v-else><span style="position: absolute;top: 0px;right: 1px;width: 50px;">元</span></template>
45 </el-input> 47 </el-input>
46 </el-form-item> 48 </el-form-item>
47 </el-col> 49 </el-col>
@@ -69,9 +71,10 @@ @@ -69,9 +71,10 @@
69 </el-col> 71 </el-col>
70 <el-col :span="12" v-if="ruleForm.isRental !== '0'"> 72 <el-col :span="12" v-if="ruleForm.isRental !== '0'">
71 <el-form-item label="免租期" prop="rentFreePeriod"> 73 <el-form-item label="免租期" prop="rentFreePeriod">
72 - <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;"> 74 + <!-- <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;">
73 <el-option :label="item" :value="item" v-for="item in 31" /> 75 <el-option :label="item" :value="item" v-for="item in 31" />
74 - </el-select> 76 + </el-select> -->
  77 + <el-input v-model="ruleForm.rentFreePeriod" placeholder="请输入" maxlength="50"></el-input>
75 </el-form-item> 78 </el-form-item>
76 </el-col> 79 </el-col>
77 <!-- <el-col :span="12" v-if="ruleForm.isRental !== '0'"> 80 <!-- <el-col :span="12" v-if="ruleForm.isRental !== '0'">
@@ -208,18 +211,19 @@ @@ -208,18 +211,19 @@
208 </el-col> 211 </el-col>
209 <el-col :span="12" v-if="formInline.applicableResources == '商铺'"> 212 <el-col :span="12" v-if="formInline.applicableResources == '商铺'">
210 <el-form-item label="经营类型" prop="businessType"> 213 <el-form-item label="经营类型" prop="businessType">
211 - <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 100%;"> 214 + <!-- <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 100%;">
212 <el-option label="超市" value="超市" /> 215 <el-option label="超市" value="超市" />
213 <el-option label="鞋店" value="鞋店" /> 216 <el-option label="鞋店" value="鞋店" />
214 <el-option label="家居饰品店" value="家居饰品店" /> 217 <el-option label="家居饰品店" value="家居饰品店" />
215 - </el-select> 218 + </el-select> -->
  219 + <el-input v-model="formInline.businessType" placeholder="请输入" maxlength="50"></el-input>
216 </el-form-item> 220 </el-form-item>
217 </el-col> 221 </el-col>
218 <el-col :span="12" v-if="formInline.isRental !== '0'"> 222 <el-col :span="12" v-if="formInline.isRental !== '0'">
219 <el-form-item label="租金价格" prop="rentalPrice"> 223 <el-form-item label="租金价格" prop="rentalPrice">
220 <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30" @input="validateNumber2('rentalPrice', $event)"> 224 <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30" @input="validateNumber2('rentalPrice', $event)">
221 - <template slot="suffix"><span  
222 - style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template> 225 + <template slot="suffix" v-if="formInline.applicableResources == '商铺'"><span style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
  226 + <template slot="suffix" v-else><span style="position: absolute;top: 0px;right: 1px;width: 50px;">元</span></template>
223 </el-input> 227 </el-input>
224 </el-form-item> 228 </el-form-item>
225 </el-col> 229 </el-col>
@@ -247,9 +251,10 @@ @@ -247,9 +251,10 @@
247 </el-col> 251 </el-col>
248 <el-col :span="12" v-if="formInline.isRental !== '0'"> 252 <el-col :span="12" v-if="formInline.isRental !== '0'">
249 <el-form-item label="免租期" prop="rentFreePeriod"> 253 <el-form-item label="免租期" prop="rentFreePeriod">
250 - <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;"> 254 + <el-input v-model="formInline.rentFreePeriod" placeholder="请输入" maxlength="50"></el-input>
  255 + <!-- <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;">
251 <el-option :label="item" :value="item" v-for="item in 31" /> 256 <el-option :label="item" :value="item" v-for="item in 31" />
252 - </el-select> 257 + </el-select> -->
253 </el-form-item> 258 </el-form-item>
254 </el-col> 259 </el-col>
255 <!-- <el-col :span="12" v-if="formInline.isRental !== '0'"> 260 <!-- <el-col :span="12" v-if="formInline.isRental !== '0'">
@@ -363,13 +368,15 @@ @@ -363,13 +368,15 @@
363 }], 368 }],
364 rentalPrice: [{ 369 rentalPrice: [{
365 required: true, 370 required: true,
366 - message: '请输入租金价格' 371 + message: '请输入租金价格',
  372 + trigger: 'change'
367 }, 373 },
368 // { 374 // {
369 // type: 'number', 375 // type: 'number',
370 // message: '必须为数字值' 376 // message: '必须为数字值'
371 // }, 377 // },
372 { 378 {
  379 + trigger: 'change',
373 validator: (rule, value, callback) => { 380 validator: (rule, value, callback) => {
374 if (value <= 0) { 381 if (value <= 0) {
375 callback(new Error('租金价格必须大于0')); 382 callback(new Error('租金价格必须大于0'));
@@ -408,7 +415,8 @@ @@ -408,7 +415,8 @@
408 }], 415 }],
409 rentalPrice: [{ 416 rentalPrice: [{
410 required: true, 417 required: true,
411 - message: '请输入租金价格' 418 + message: '请输入租金价格',
  419 + trigger: 'change'
412 }, 420 },
413 // { 421 // {
414 // type: 'number', 422 // type: 'number',
admin-web-master/src/components/change/mbadd.vue
  View file @0c19043
@@ -7,6 +7,12 @@ @@ -7,6 +7,12 @@
7 <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '单行文本'" :style="iscopy?'width: calc(100% - 35px)':''"> 7 <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '单行文本'" :style="iscopy?'width: calc(100% - 35px)':''">
8 <el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200" @input="e=>inputvalue(e,item.key)"></el-input> 8 <el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200" @input="e=>inputvalue(e,item.key)"></el-input>
9 </el-form-item> 9 </el-form-item>
  10 + <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '联系电话'" :style="iscopy?'width: calc(100% - 35px)':''">
  11 + <el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200" @input="inputphone(index, $event,item.key)"></el-input>
  12 + </el-form-item>
  13 + <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '银行账号'" :style="iscopy?'width: calc(100% - 35px)':''">
  14 + <el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200" @input="inputmo(index, $event,item.key)"></el-input>
  15 + </el-form-item>
10 <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '单行数字文本'" :style="iscopy?'width: calc(100% - 35px)':''"> 16 <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '单行数字文本'" :style="iscopy?'width: calc(100% - 35px)':''">
11 <el-input v-model.number="item.value" placeholder="请输入" :maxlength="item.length?item.length:200" 17 <el-input v-model.number="item.value" placeholder="请输入" :maxlength="item.length?item.length:200"
12 @input="validateNumber(index, $event,item.key)"></el-input> 18 @input="validateNumber(index, $event,item.key)"></el-input>
@@ -278,6 +284,36 @@ @@ -278,6 +284,36 @@
278 // 返回复制操作的最终结果 284 // 返回复制操作的最终结果
279 return copyResult; 285 return copyResult;
280 }, 286 },
  287 + inputphone(index, value, onindex) {
  288 + // 允许数字和短横线
  289 + const cleanValue = value.replace(/[^\d-]/g, '');
  290 +
  291 + // 限制最大长度（手机11位，带区号座机最大13位如：0371-12345678）
  292 + const truncatedValue = cleanValue.slice(0, 13);
  293 +
  294 + this.list1[index].value = truncatedValue;
  295 + this.forminfo[onindex] = truncatedValue;
  296 + },
  297 + inputmo(index, value, onindex) {
  298 + // 优化1：移除非数字字符（银行账号不需要小数点）
  299 + const cleanValue = value.replace(/\D/g, '');
  300 +
  301 + // 优化2：限制最大长度19位
  302 + const truncatedValue = cleanValue.slice(0, 19);
  303 +
  304 + // 优化3：仅更新值（去掉无效的正则判断）
  305 + this.list1[index].value = truncatedValue;
  306 + this.forminfo[onindex] = truncatedValue;
  307 +
  308 + // 优化4：添加格式美化（每4位空格分隔）
  309 + // 如果需要显示格式可以启用（但存储值保持纯数字）：
  310 + // this.$nextTick(() => {
  311 + // const formatted = truncatedValue.replace(/(\d{4})(?=\d)/g, '$1 ');
  312 + // if (formatted !== value) {
  313 + // this.list1[index].value = formatted;
  314 + // }
  315 + // });
  316 + },
281 validateNumber(index, value,onindex) { 317 validateNumber(index, value,onindex) {
282 // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数 318 // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
283 const regex = /^\d+(\.\d{1,2})?$/; 319 const regex = /^\d+(\.\d{1,2})?$/;
admin-web-master/src/components/change/zy.vue
  View file @0c19043
@@ -28,18 +28,18 @@ @@ -28,18 +28,18 @@
28 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 28 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
29 <el-table-column label="选择" type="selection" width="55"> 29 <el-table-column label="选择" type="selection" width="55">
30 </el-table-column> 30 </el-table-column>
31 - <el-table-column label="序号"> 31 + <el-table-column label="序号" width="80">
32 <template slot-scope="scope"> 32 <template slot-scope="scope">
33 {{scope.$index +1 }} 33 {{scope.$index +1 }}
34 </template> 34 </template>
35 </el-table-column> 35 </el-table-column>
36 - <el-table-column label="编号" prop="id"></el-table-column> 36 + <!-- <el-table-column label="编号" prop="id"></el-table-column> -->
37 <el-table-column label="资源名称"> 37 <el-table-column label="资源名称">
38 <template slot-scope="scope"> 38 <template slot-scope="scope">
39 {{scope.row.shopName ? scope.row.shopName : scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}} 39 {{scope.row.shopName ? scope.row.shopName : scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
40 </template> 40 </template>
41 </el-table-column> 41 </el-table-column>
42 - <el-table-column label="资源类型"> 42 + <el-table-column label="资源类型" width="120">
43 <template slot-scope="scope"> 43 <template slot-scope="scope">
44 {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}} 44 {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
45 </template> 45 </template>
admin-web-master/src/layout/index.vue
  View file @0c19043
@@ -197,17 +197,17 @@ @@ -197,17 +197,17 @@
197 } 197 }
198 } 198 }
199 return { 199 return {
200 - // msg: [],  
201 - // list: [], 200 + msg: [],
  201 + list: [],
202 // msg: ['招商服务系统'], 202 // msg: ['招商服务系统'],
203 - msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],  
204 - list: [  
205 - ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],  
206 - ['品牌策划', '活动策划', '氛围策划', '媒体推广'],  
207 - ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],  
208 - ['联机交易', '对账处理', '日志管理', '商户服务'],  
209 - ['渠道售票统计分析', '销售额统计分析'],  
210 - ], 203 + // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
  204 + // list: [
  205 + // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
  206 + // ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
  207 + // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
  208 + // ['联机交易', '对账处理', '日志管理', '商户服务'],
  209 + // ['渠道售票统计分析', '销售额统计分析'],
  210 + // ],
211 listMune: [], 211 listMune: [],
212 mumeList: [], 212 mumeList: [],
213 mumeChildren1: [], 213 mumeChildren1: [],
@@ -296,10 +296,10 @@ @@ -296,10 +296,10 @@
296 this.userAvatar = getUserAvatar() 296 this.userAvatar = getUserAvatar()
297 }, 297 },
298 mounted() { 298 mounted() {
299 - // this.getMemu()  
300 - // this.address()  
301 - // this.waibu()  
302 - this.neibu() 299 + this.getMemu()
  300 + this.address()
  301 + this.waibu()
  302 + // this.neibu()
303 }, 303 },
304 304
305 methods: { 305 methods: {
@@ -780,12 +780,12 @@ @@ -780,12 +780,12 @@
780 ['联机交易', '对账处理', '日志管理', '商户服务'], 780 ['联机交易', '对账处理', '日志管理', '商户服务'],
781 ['渠道售票统计分析', '销售额统计分析'], 781 ['渠道售票统计分析', '销售额统计分析'],
782 ] 782 ]
783 - this.neibu() 783 + // this.neibu()
784 784
785 785
786 - // this.getMemu()  
787 - // this.waibu()  
788 - // this.list = this.mumeList 786 + this.getMemu()
  787 + this.waibu()
  788 + this.list = this.mumeList
789 789
790 790
791 }, 791 },
admin-web-master/src/main.js
  View file @0c19043
@@ -37,10 +37,15 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd @@ -37,10 +37,15 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd
37 37
38 let host = window.location.host; 38 let host = window.location.host;
39 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 39 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
40 - Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'  
41 - Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`  
42 - Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`  
43 - Vue.prototype.$API = `https://jy.scjysm.asia:18086/cdwlMall/meserver/api` 40 + // Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
  41 + // Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
  42 + // Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
  43 + // Vue.prototype.$API = `https://jy.scjysm.asia:18086/cdwlMall/meserver/api`
  44 +
  45 + Vue.prototype.$baseURL ='https://zhgw-uat.028wlkj.com/cdwlMall'
  46 + Vue.prototype.$fontBold = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
  47 + Vue.prototype.$fontRegular = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
  48 + Vue.prototype.$API = `https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api`
44 } else { 49 } else {
45 Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api` 50 Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api`
46 Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall` 51 Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall`
admin-web-master/src/utils/request2.js
  View file @0c19043
@@ -16,7 +16,8 @@ let hostall = window.location.href; @@ -16,7 +16,8 @@ let hostall = window.location.href;
16 let baseURL = '' 16 let baseURL = ''
17 // || host === 'localhost:9528' 17 // || host === 'localhost:9528'
18 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 18 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
19 - baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 19 + // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
  20 + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
20 // baseURL = 'http://172.16.61.125:9004'; 21 // baseURL = 'http://172.16.61.125:9004';
21 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; 22 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
22 // baseURL = 'http://128.10.249.206:9004'; 23 // baseURL = 'http://128.10.249.206:9004';
lvdao-miniapp/pages.json
  View file @0c19043
@@ -389,6 +389,30 @@ @@ -389,6 +389,30 @@
389 "navigationBarBackgroundColor": "#FFFFFF", 389 "navigationBarBackgroundColor": "#FFFFFF",
390 "navigationBarTitleText": "问卷调查" 390 "navigationBarTitleText": "问卷调查"
391 } 391 }
  392 + },
  393 + {
  394 + "path" : "pages/orderList/orderListdetails",
  395 + "style" :
  396 + {
  397 + "navigationBarBackgroundColor": "#FFFFFF",
  398 + "navigationBarTitleText": "订单详情"
  399 + }
  400 + },
  401 + {
  402 + "path" : "pages/orderList/aftersaledetails",
  403 + "style" :
  404 + {
  405 + "navigationBarBackgroundColor": "#FFFFFF",
  406 + "navigationBarTitleText": "售后订单详情"
  407 + }
  408 + },
  409 + {
  410 + "path" : "pages/orderList/inventorydetails",
  411 + "style" :
  412 + {
  413 + "navigationBarBackgroundColor": "#FFFFFF",
  414 + "navigationBarTitleText": "商品详情"
  415 + }
392 } 416 }
393 ], 417 ],
394 "subpackages": [{ 418 "subpackages": [{
lvdao-miniapp/pages/orderList/aftersale.vue
  View file @0c19043
1 <template> 1 <template>
  2 + <view class="page">
  3 + <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs>
  4 + <view style="padding: 0 20rpx;">
  5 + <view v-for="(item,index) in alllist" :key="index"
  6 + @click="gopath('/pages/orderList/aftersaledetails',item.afterId)"
  7 + style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;">
  8 + <view style="display: flex;line-height: 50rpx;">
  9 + <view>
  10 + 售后单号：
  11 + </view>
  12 + <view class="t1">
  13 + {{item.afterFormid}}
  14 + </view>
  15 + </view>
  16 + <view style="display: flex;line-height: 50rpx;">
  17 + <view>
  18 + 售后类型：
  19 + </view>
  20 + <view class="t1">
  21 + <span v-if="item.afterType == 1">仅退款</span>
  22 + <span v-if="item.afterType == 2">退货退款</span>
  23 + </view>
  24 + </view>
  25 + <view style="display: flex;line-height: 50rpx;">
  26 + <view>
  27 + 退款金额：
  28 + </view>
  29 + <view class="t1">
  30 + {{item.price}}
  31 + </view>
  32 + </view>
  33 + <view style="display: flex;line-height: 50rpx;">
  34 + <view>
  35 + 售后状态：
  36 + </view>
  37 + <view class="t1">
  38 + {{item.afterStateName}}
  39 + </view>
  40 + </view>
  41 + <view style="display: flex;line-height: 50rpx;">
  42 + <view>
  43 + 申请时间：
  44 + </view>
  45 + <view class="t1">
  46 + {{item.createTime}}
  47 + </view>
  48 + </view>
  49 + </view>
  50 + </view>
  51 + </view>
2 </template> 52 </template>
3 53
4 <script> 54 <script>
  55 + export default {
  56 + data() {
  57 + return {
  58 + list: [{
  59 + type: '',
  60 + name: '全部'
  61 + },
  62 + {
  63 + type: '1',
  64 + name: '待商家处理'
  65 + },
  66 + {
  67 + type: '2',
  68 + name: '待商家收货'
  69 + },
  70 + ],
  71 + current: 0,
  72 + alllist: [],
  73 + pageindex: {
  74 + page: 1,
  75 + pageSize: 10,
  76 + type: '',
  77 + searchType: "1"
  78 + },
  79 + imgurl: '',
  80 + total: 0
  81 + };
  82 + },
  83 + onLoad(optiong) {
  84 + this.imgurl = this.$img
  85 + this.getALL()
  86 + // this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => {
  87 + // //成功回调
  88 + // this.list = res.data.data.list
  89 + // })
  90 + },
  91 + onReachBottom(e) {
  92 + console.error(e)
  93 + if (this.alllist.length < this.total) {
  94 + this.pageindex.page++
  95 + this.getALL()
  96 + }
  97 + },
  98 + methods: {
  99 + gopath(url, id) {
  100 + uni.navigateTo({
  101 + url: url + '?id=' + id
  102 + })
  103 + },
  104 + getALL() {
  105 + this.$http.sendRequest('/after/getAll', 'POST', this.pageindex, 2).then(res => {
  106 + //成功回调
  107 + this.alllist = [...this.alllist, ...res.data.data.list]
  108 + this.total = res.data.data.total
  109 + console.error(this.alllist)
  110 + })
  111 + },
  112 + change(index) {
  113 + this.current = index;
  114 + if (this.current == 0) {
  115 + this.pageindex.type = ''
  116 + } else {
  117 + this.pageindex.type = this.list[this.current].type
  118 + }
  119 + this.pageindex.page = 1
  120 + this.alllist = []
  121 + this.getALL()
  122 + }
  123 +
  124 + }
  125 + }
5 </script> 126 </script>
6 127
7 -<style> 128 +<style scoped lang="scss">
  129 + .page {}
  130 +
  131 + .t1 {
  132 + font-size: 26rpx;
  133 + color: #979797;
  134 + }
8 </style> 135 </style>
9 \ No newline at end of file 136 \ No newline at end of file
lvdao-miniapp/pages/orderList/aftersaledetails.vue 0 → 100644
  View file @0c19043
  1 +<!-- 订单详情 -->
  2 +<template>
  3 + <view>
  4 + <view>
  5 + <view class="content" style="padding-bottom:200upx;">
  6 + <view class="order-details-info-box">
  7 +
  8 + <view class="order-list-box">
  9 + <view class="item">
  10 + <view class="order-info-box">
  11 + <view class="order-info">
  12 + <view class="order-info-item" v-for="proItem in dataList.products"
  13 + :key="proItem.productId">
  14 + <image :src="imgurl+proItem.image" class="product-img default-img"></image>
  15 + <view class="info-box">
  16 + <text class="product-name">{{ proItem.productName }}</text>
  17 + <view class="price-sku-box">
  18 + <view class="product-sku">
  19 + <view class="mar-left-20" v-for="vItem in proItem.values">
  20 + <text>规格：{{ vItem }}</text>
  21 + </view>
  22 + </view>
  23 + <view class="product-num">x {{ proItem.number }}</view>
  24 + </view>
  25 + </view>
  26 + </view>
  27 + <view class="delivery-way-box">
  28 + <view class="item">
  29 + <text class="way">退款总金额</text>
  30 + <text class="way">¥{{ dataList.price }}</text>
  31 + </view>
  32 + <view class="item">
  33 + <text class="way">快递运费</text>
  34 + <text class="way">¥{{ dataList.logisticsPrice }}</text>
  35 + </view>
  36 + </view>
  37 + </view>
  38 + </view>
  39 + </view>
  40 + </view>
  41 + </view>
  42 + <view class="order-details-information padd">
  43 + <view class="order-title">
  44 + <text>售后信息</text>
  45 + </view>
  46 + <view class="info-box">
  47 +
  48 + <view class="item">
  49 + <text>售后单号：{{ dataList.afterFormid }}</text>
  50 + <text class="copy-color" :data-clipboard-text="dataList.orderFormid" @click="copy">复制</text>
  51 + </view>
  52 + <view class="item">
  53 + <text>订单编号：{{ dataList.orderFormid }}</text>
  54 + <text class="copy-color" :data-clipboard-text="dataList.orderFormid" @click="copy">复制</text>
  55 + </view>
  56 + <view class="item">
  57 + <text>售后类型：{{dataList.afterType=='1'?'仅退款':dataList.afterType=='2'?'退货退款':'-'}}</text>
  58 + </view>
  59 + <view class="item">
  60 + <text>买家账户：{{ dataList.customerName }}</text>
  61 + </view>
  62 + <view class="item">
  63 + <text>申请时间：{{ dataList.createTime }}</text>
  64 + </view>
  65 + <view class="item">
  66 + <text>最近处理时间：{{ dataList.updateTime }}</text>
  67 + </view>
  68 + <view class="item">
  69 + <text>备注：{{ dataList.remark }}</text>
  70 + </view>
  71 + </view>
  72 + </view>
  73 + <view class="order-details-information padd" style="margin-top: 40rpx;">
  74 + <view class="order-title">
  75 + <text>售后记录</text>
  76 + </view>
  77 + <view class="info-box">
  78 +
  79 + <view style="border: 2rpx solid #eee;padding: 20rpx;border-radius: 18rpx;margin-bottom: 30rpx;" v-for="(item1, index1) in dataList.afterHistory" :key="index1">
  80 + <view class="item">
  81 + <text>{{ item1.title || '-'}}</text>
  82 + </view>
  83 + <view>
  84 + <view class="item">
  85 + <text>买家名称：{{ item1.name || '-'}}</text>
  86 + </view>
  87 + <view class="item">
  88 + <text>申请时间：{{ item1.time || '-'}}</text>
  89 + </view>
  90 + </view>
  91 + <view class="item">
  92 + <text>留言：{{ item1.reason || '-'}}</text>
  93 + </view>
  94 + <view class="item" v-if="item1.images.length>0">
  95 + <text>买家举证图片：</text>
  96 + </view>
  97 + <view style="display: flex;flex-wrap: wrap;" v-if="item1.images.length>0">
  98 + <view v-for="(item2, index2) in item1.images" :key="index2">
  99 + <image :src="imgurl+item2" class="product-img" style="margin-top: 10rpx;margin-right: 10rpx;"></image>
  100 + </view>
  101 + </view>
  102 + </view>
  103 + </view>
  104 + </view>
  105 +
  106 + </view>
  107 +
  108 +
  109 +
  110 + </view>
  111 + </view>
  112 +</template>
  113 +
  114 +<script>
  115 + export default {
  116 +
  117 + data() {
  118 + return {
  119 + dataList: {
  120 + orderFormid: null,
  121 + createTime: null,
  122 + orderPrice: 0,
  123 + logisticsPrice: 0,
  124 + discountPrice: 0
  125 + },
  126 + imgurl: '',
  127 +
  128 +
  129 +
  130 +
  131 + }
  132 + },
  133 +
  134 + onShow() {
  135 +
  136 + },
  137 + onLoad(options) {
  138 + this.imgurl = this.$img
  139 + console.log(options)
  140 + this.$http.sendRequest('/after/getById', 'POST', {
  141 + afterId: options.id
  142 + }, 2).then(res => {
  143 + this.dataList = res.data.data
  144 + })
  145 + return
  146 +
  147 + },
  148 +
  149 + methods: {
  150 + copy() {
  151 + // #ifdef H5
  152 + let clipboard = new ClipboardJS('.copy-color');
  153 + clipboard.on('success', function(e) {
  154 + uni.showToast({
  155 + title: '复制成功',
  156 + icon: 'success'
  157 + })
  158 + clipboard.destroy();
  159 + })
  160 + clipboard.on('error', function(e) {
  161 + uni.showToast({
  162 + title: '复制失败',
  163 + icon: 'success'
  164 + })
  165 + clipboard.destroy();
  166 + })
  167 + // #endif
  168 + // #ifndef H5
  169 + uni.setClipboardData({
  170 + data: this.dataList.orderFormid,
  171 + success: function() {
  172 + uni.showToast({
  173 + title: '复制成功',
  174 + icon: 'success'
  175 + })
  176 + }
  177 + });
  178 + // #endif
  179 + },
  180 +
  181 +
  182 + },
  183 +
  184 + }
  185 +</script>
  186 +
  187 +<style lang="scss" scoped>
  188 + page {
  189 + background: #f7f7f7;
  190 + }
  191 +
  192 + .logistics {
  193 + padding: 20upx 20upx;
  194 + }
  195 +
  196 + .content {
  197 + padding: 0 0 160upx 0;
  198 + }
  199 +
  200 + .order-details-status {
  201 + width: 750upx;
  202 + height: 250upx;
  203 + background: #333333;
  204 + }
  205 +
  206 + .status-title-box {
  207 + display: flex;
  208 + flex-direction: row;
  209 + align-items: center;
  210 + justify-content: center;
  211 + padding: 40upx 30upx 0;
  212 + box-sizing: border-box;
  213 + text-align: center;
  214 + }
  215 +
  216 + .status-title-box2 {
  217 + display: flex;
  218 + flex-direction: column;
  219 + align-items: center;
  220 + padding: 40upx 30upx 0;
  221 + box-sizing: border-box;
  222 + }
  223 +
  224 + .status-title-box .l {
  225 + display: flex;
  226 + flex-direction: column;
  227 + }
  228 +
  229 + .status-title-box .l .status,
  230 + .status-title-box2 .status {
  231 + font-size: 30upx;
  232 + color: #fff;
  233 + }
  234 +
  235 + .status-title-box .l .label,
  236 + .status-title-box2 .label {
  237 + font-size: 24upx;
  238 + color: #fff;
  239 + margin-top: 14upx;
  240 + }
  241 +
  242 + .status-title-box .r {
  243 + width: 80upx;
  244 + height: 80upx;
  245 + }
  246 +
  247 + .order-details-info-box {
  248 + padding: 0 30upx;
  249 + box-sizing: border-box;
  250 + // margin-top: -80upx;
  251 + }
  252 +
  253 + .address-box {
  254 + margin-top: 20upx;
  255 + background: #fff;
  256 + width: 100%;
  257 + padding: 30upx;
  258 + box-sizing: border-box;
  259 + display: flex;
  260 + flex-direction: row;
  261 + align-items: center;
  262 + }
  263 +
  264 + .address-box .address-img {
  265 + width: 70upx;
  266 + height: 70upx;
  267 + margin-right: 20upx;
  268 + }
  269 +
  270 + .address-box .address-r {
  271 + flex: 1;
  272 + display: flex;
  273 + flex-direction: column;
  274 + font-size: 28upx;
  275 + color: #333;
  276 + }
  277 +
  278 + .arrow-right-img {
  279 + width: 24upx;
  280 + height: 24upx;
  281 + margin-left: 20upx;
  282 + }
  283 +
  284 + .address-name-box {
  285 + font-size: 30upx;
  286 + color: #333;
  287 + }
  288 +
  289 + .phone {
  290 + font-size: 24upx;
  291 + color: #999;
  292 + margin-left: 20upx;
  293 + }
  294 +
  295 + .address-info {
  296 + font-size: 28upx;
  297 + color: #333;
  298 + margin-top: 15upx;
  299 + }
  300 +
  301 + .order-list-box {
  302 + margin-top: 20upx;
  303 +
  304 + .toService {
  305 + line-height: 40rpx;
  306 + padding: 0 8rpx;
  307 + border: 1rpx solid #FAF6ED;
  308 + cursor: pointer;
  309 + display: flex;
  310 + align-items: center;
  311 +
  312 + .service-img {
  313 + width: 60upx;
  314 + height: 60upx;
  315 + margin-right: 12rpx;
  316 + }
  317 +
  318 + text {
  319 + line-height: 40rpx;
  320 + }
  321 + }
  322 + }
  323 +
  324 + .order-list-box .item {
  325 + margin-bottom: 20upx;
  326 + background: #fff;
  327 + }
  328 +
  329 + .order-list-top {
  330 + height: 96upx;
  331 + padding: 0 30upx;
  332 + box-sizing: border-box;
  333 + display: flex;
  334 + flex-direction: row;
  335 + align-items: center;
  336 + justify-content: space-between;
  337 + border-bottom: 1px solid #eee;
  338 + }
  339 +
  340 + .top-l {
  341 + display: flex;
  342 + flex-direction: row;
  343 + align-items: center;
  344 + }
  345 +
  346 + .shop-img {
  347 + width: 34upx;
  348 + height: 34upx;
  349 + margin-right: 10upx;
  350 + }
  351 +
  352 + .shop-name {
  353 + font-size: 30upx;
  354 + color: #333;
  355 + font-weight: bold;
  356 + }
  357 +
  358 + .arrow-img {
  359 + margin-left: 15upx;
  360 + width: 24upx;
  361 + height: 24upx;
  362 + }
  363 +
  364 + .order-info-box {
  365 + padding: 0 30upx;
  366 + box-sizing: border-box;
  367 + }
  368 +
  369 + .order-info {
  370 + border-bottom: 1px solid #eee;
  371 + }
  372 +
  373 + .order-info-item {
  374 + display: flex;
  375 + flex-direction: row;
  376 + padding: 20upx 0;
  377 + }
  378 +
  379 + .product-img {
  380 + width: 180upx;
  381 + height: 180upx;
  382 + border-radius: 10upx;
  383 + margin-right: 30upx;
  384 + }
  385 +
  386 + .info-box {
  387 + flex: 1;
  388 + display: flex;
  389 + flex-direction: column;
  390 + justify-content: space-between;
  391 + }
  392 +
  393 + .product-name {
  394 + font-size: 26upx;
  395 + color: #333;
  396 + height: 68upx;
  397 + line-height: 34upx;
  398 + display: -webkit-box;
  399 + overflow: hidden;
  400 + text-overflow: ellipsis;
  401 + word-break: break-all;
  402 + -webkit-box-orient: vertical;
  403 + -webkit-line-clamp: 2;
  404 + }
  405 +
  406 + .price-sku-box {
  407 + width: 100%;
  408 + display: flex;
  409 + flex-direction: row;
  410 + align-items: center;
  411 + justify-content: space-between;
  412 + }
  413 +
  414 + .product-sku {
  415 + font-size: 24upx;
  416 + color: #999;
  417 + display: inline-block;
  418 + margin-left: -20upx;
  419 + display: flex;
  420 + flex-direction: row;
  421 + }
  422 +
  423 + .price-box {
  424 + display: flex;
  425 + flex-direction: column;
  426 + }
  427 +
  428 + .product-price1 {
  429 + font-size: 24upx;
  430 + color: #333;
  431 + font-weight: 400;
  432 + }
  433 +
  434 + .product-price2 {
  435 + font-size: 24upx;
  436 + color: #999;
  437 + text-decoration: line-through;
  438 + font-weight: 400;
  439 + }
  440 +
  441 + .product-price .fuhao {
  442 + font-size: 28upx;
  443 + }
  444 +
  445 + .item-applay-btn {
  446 + height: 50upx;
  447 + display: flex;
  448 + flex-direction: row;
  449 + align-items: center;
  450 + justify-content: center;
  451 + padding: 0 30upx;
  452 + background: rgba(255, 255, 255, 1);
  453 + border: 1px solid rgba(187, 187, 187, 1);
  454 + border-radius: 25upx;
  455 + font-size: 24upx;
  456 + font-weight: 400;
  457 + color: rgba(51, 51, 51, 1);
  458 + }
  459 +
  460 + .product-num {
  461 + font-size: 28upx;
  462 + color: #999;
  463 + display: inline-block;
  464 + }
  465 +
  466 + .delivery-way-box {
  467 + display: flex;
  468 + flex-direction: column;
  469 + margin: 30upx 0 10upx;
  470 + }
  471 +
  472 + .delivery-way-box .item {
  473 + display: flex;
  474 + flex-direction: row;
  475 + align-items: center;
  476 + justify-content: space-between;
  477 + font-size: 26upx;
  478 + color: #333;
  479 + }
  480 +
  481 + .delivery-way-box .item .way {
  482 + color: #999;
  483 + }
  484 +
  485 + .order-total-box {
  486 + padding: 30upx 0;
  487 + display: flex;
  488 + flex-direction: row;
  489 + align-items: center;
  490 + justify-content: space-between;
  491 + font-size: 26upx;
  492 + color: #333;
  493 + }
  494 +
  495 + .order-total-box .way-color {
  496 + color: #333333;
  497 + font-size: 32rpx;
  498 + }
  499 +
  500 + .order-details-information {
  501 + background: #fff;
  502 + }
  503 +
  504 + .order-details-information.padd {
  505 + padding: 30upx;
  506 + margin: 0 30upx;
  507 + box-sizing: border-box;
  508 + }
  509 +
  510 + .order-details-information .order-title {
  511 + font-size: 30upx;
  512 + color: #333;
  513 + font-weight: 500;
  514 + display: flex;
  515 + flex-direction: row;
  516 + align-items: center;
  517 + }
  518 +
  519 + .order-details-information .info-box {
  520 + margin-top: 30upx;
  521 + }
  522 +
  523 + .order-details-information .info-box .item {
  524 + display: flex;
  525 + flex-direction: row;
  526 + align-items: center;
  527 + justify-content: space-between;
  528 + font-size: 24upx;
  529 + color: #666;
  530 + margin-bottom: 20upx;
  531 + }
  532 +
  533 + .order-details-information .info-box .item .copy-color {
  534 + font-size: 24upx;
  535 + color: #C5AA7B;
  536 + }
  537 +
  538 + .order-details-btn {
  539 + position: fixed;
  540 + bottom: 0;
  541 + left: 0;
  542 + width: 100%;
  543 + min-height: 160upx;
  544 + background: #fff;
  545 + box-shadow: 0px 0px 10px 0px rgba(51, 51, 51, 0.1);
  546 + box-sizing: border-box;
  547 + display: flex;
  548 + padding: 0 30upx;
  549 + flex-direction: row;
  550 + align-items: center;
  551 + justify-content: space-between;
  552 + z-index: 10;
  553 + }
  554 +
  555 + .order-details-btn .btn {
  556 + width: 100%;
  557 + height: 100upx;
  558 + background: #333333;
  559 + font-size: 28upx;
  560 + color: #FFEBC4;
  561 + text-align: center;
  562 + line-height: 100upx;
  563 + font-weight: 500upx;
  564 + }
  565 +
  566 + .order-details-btn .btn-l {
  567 + width: 50%;
  568 + height: 100upx;
  569 + border: 2rpx solid #333333;
  570 + font-size: 28upx;
  571 + color: #333;
  572 + text-align: center;
  573 + line-height: 100upx;
  574 + box-sizing: border-box;
  575 + margin-right: 10rpx;
  576 + }
  577 +
  578 + .order-details-btn .btn-r {
  579 + width: 50%;
  580 + margin-left: 10rpx;
  581 + }
  582 +
  583 + .mt20 {
  584 + margin-top: 20upx;
  585 + }
  586 +
  587 + .order-title-box {
  588 + display: flex;
  589 + flex-direction: row;
  590 + align-items: center;
  591 + justify-content: space-between;
  592 + }
  593 +
  594 + .order-details-information .order-title-box .order-title.padd-l {
  595 + padding-left: 30upx;
  596 + }
  597 +
  598 + .arrow-down-img {
  599 + width: 40upx;
  600 + height: 40upx;
  601 + margin: 30upx;
  602 + box-sizing: border-box;
  603 + }
  604 +
  605 + .evaluate {
  606 + height: 56upx;
  607 + border-radius: 28upx;
  608 + text-align: center;
  609 + line-height: 56upx;
  610 + font-size: 26upx;
  611 + padding: 0 30upx;
  612 + border: 1px solid #C5AA7B;
  613 + color: #C5AA7B;
  614 + }
  615 +
  616 + .evaluate2 {
  617 + height: 56upx;
  618 + border-radius: 28upx;
  619 + text-align: center;
  620 + line-height: 56upx;
  621 + font-size: 26upx;
  622 + padding: 0 30upx;
  623 + border: 1px solid #BBBBBB;
  624 + color: #333;
  625 + }
  626 +
  627 + .emptyOrder-box {
  628 + padding: 70upx 0;
  629 +
  630 + .emptyOrder-img {
  631 + width: 200upx;
  632 + height: 200upx;
  633 + }
  634 + }
  635 +
  636 + .pay-type-item {
  637 + .pay-type-radio {
  638 + background-color: white;
  639 + border-bottom: 1upx solid #EDEDED;
  640 + margin-bottom: 20upx;
  641 + padding: 24upx 20upx 24upx 20upx;
  642 +
  643 + .pay-type-img {
  644 + display: inline-block;
  645 +
  646 + .pay-type-img-inner {
  647 + width: 50upx;
  648 + height: 50upx;
  649 + vertical-align: middle;
  650 + }
  651 + }
  652 +
  653 + .pay-type-label {
  654 + vertical-align: middle;
  655 + margin-left: 30upx;
  656 + }
  657 +
  658 + .pay-type-radio-item {
  659 + float: right;
  660 + margin-right: 20upx;
  661 + width: 50upx;
  662 + height: 50upx;
  663 + }
  664 + }
  665 +
  666 + .huabei-detail {
  667 + margin-top: 20upx;
  668 +
  669 + .fenqi-wenzi {
  670 + display: inline-block;
  671 + margin-left: 64upx;
  672 + }
  673 +
  674 + .fenqi-amount {
  675 + display: block;
  676 + margin-left: 64upx;
  677 + margin-top: 14upx;
  678 + color: #BABBBC;
  679 + }
  680 +
  681 + .fenqi-charge-fee {
  682 + float: right;
  683 + margin-right: 68upx;
  684 + color: #BABBBC;
  685 + }
  686 +
  687 + .fenqi-modal {
  688 + width: 40upx;
  689 + height: 40upx;
  690 + margin-left: 20upx;
  691 + float: right;
  692 + position: relative;
  693 + top: -80upx;
  694 + }
  695 + }
  696 + }
  697 +
  698 + .paytype-confirm {
  699 + height: 120upx;
  700 + padding: 0upx 108upx 0upx 32upx;
  701 +
  702 + .fenqi-all {
  703 + display: inline-block;
  704 + width: 100%;
  705 + }
  706 +
  707 + .fenqi-total-amount {
  708 + width: 65%;
  709 + float: left;
  710 + }
  711 +
  712 + .fenqi-confirm {
  713 + float: right;
  714 + width: 160upx;
  715 + padding: 0upx 20upx;
  716 +
  717 + .btn {
  718 + width: 216upx;
  719 + height: 80upx;
  720 + line-height: 80upx;
  721 + border-radius: 40upx;
  722 + font-size: 28upx;
  723 + text-align: center;
  724 + background: linear-gradient(90deg, rgba(255, 162, 0, 1), rgba(255, 121, 17, 1));
  725 + color: #fff;
  726 + display: inline-block;
  727 + margin-right: 66upx;
  728 + }
  729 + }
  730 + }
  731 +
  732 + .period-radio {
  733 + margin: 30upx;
  734 + padding-right: 100upx;
  735 + width: 95%;
  736 + border-bottom: 1px solid #EFEFEF;
  737 +
  738 + .period-amount {
  739 + display: inline-block;
  740 +
  741 + .period-each-charge {
  742 + display: inline-block;
  743 + margin-top: 12upx;
  744 + margin-left: 6upx;
  745 + font-size: 26upx;
  746 + color: #b7b7b7;
  747 + margin-bottom: 13upx;
  748 + }
  749 + }
  750 +
  751 + .period-each {
  752 + display: block;
  753 + }
  754 +
  755 + .period-type-radio-item {
  756 + float: right;
  757 + }
  758 + }
  759 +</style>
0 \ No newline at end of file 760 \ No newline at end of file
lvdao-miniapp/pages/orderList/details.scss 0 → 100644
  View file @0c19043
  1 +.page {
  2 + position: relative;
  3 + width: 100%;
  4 + // height: 100%;
  5 + overflow-x: hidden;
  6 + // overflow-y: auto;
  7 +}
  8 +
  9 +// 图片
  10 +.banner-img {
  11 + width: 100%;
  12 + height: 30vh;
  13 + line-height: 80rpx;
  14 +}
  15 +// 商铺信息
  16 +.banner {
  17 + position: absolute;
  18 + top: calc(30vh - 30rpx);
  19 + width: 100%;
  20 + // margin-top: -20rpx;
  21 + border-radius: 30rpx;
  22 + background-color: #fff;
  23 + padding: 26rpx 34rpx 100rpx;
  24 + .banner-item {
  25 + border-bottom: 2rpx solid #EBEBEB;
  26 + padding-bottom: 32rpx;
  27 + .banner-item-title {
  28 + font-size: 28rpx;
  29 + font-weight: 700;
  30 + line-height: 48rpx;
  31 + margin-top: 30rpx;
  32 + }
  33 + .banner-item-form {
  34 + .form-item {
  35 + line-height: 30rpx;
  36 + font-size: 24rpx;
  37 + display: flex;
  38 + justify-content: flex-start;
  39 + align-items: top;
  40 + padding: 14rpx 0;
  41 + }
  42 + }
  43 + &:last-child {
  44 + border-bottom: unset;
  45 + }
  46 + }
  47 + // 基础信息
  48 + .info {
  49 + .info-title {
  50 + font-weight: bold;
  51 + font-size: 32rpx;
  52 + // margin-bottom: 24rpx;
  53 + span {
  54 + display: inline-block;
  55 + padding: 0 8rpx;
  56 + }
  57 + }
  58 + .info-text {
  59 + margin-bottom: 30rpx;
  60 + }
  61 + .info-racord {
  62 + display: flex;
  63 + justify-content: space-between;
  64 + align-items: center;
  65 + .info-price {
  66 + color: #31AA6A;
  67 + span {
  68 + font-size: 40rpx;
  69 + font-weight: 700;
  70 + margin-right: 4rpx;
  71 + }
  72 + }
  73 + }
  74 + }
  75 + // 场地信息
  76 + // 位置信息
  77 + .position {
  78 + .position-info {
  79 + display: flex;
  80 + align-items: center;
  81 + flex-direction: row;
  82 + margin: 53rpx 22rpx;
  83 + background-color: #fff;
  84 + font-size: 24rpx;
  85 + padding: 20rpx 16rpx;
  86 + line-height: 30rpx;
  87 + border-radius: 14rpx;
  88 + text {
  89 + margin-left: 10rpx;
  90 + }
  91 + }
  92 + }
  93 + // 周边商铺
  94 + .other-business {
  95 + .scroll-view_H {
  96 + white-space: nowrap;
  97 + width: 100%;
  98 + }
  99 + .scroll-view-item_H {
  100 + display: inline-block;
  101 + width: 210rpx;
  102 + margin-right: 22rpx;
  103 + &:last-child {
  104 + margin-right: 0;
  105 + }
  106 + .business-card {
  107 + width: 100%;
  108 + .u-image {
  109 + overflow: hidden !important;
  110 + border-radius: 20rpx !important;
  111 + }
  112 + .business-card-title {
  113 + width: 100%;
  114 + overflow : hidden;/*必须结合的属性,当内容溢出元素框时发生的事情*/
  115 + text-overflow: ellipsis;/*可以用来多行文本的情况下，用省略号“…”隐藏超出范围的文本 。*/
  116 + // display: -webkit-box;/*必须结合的属性 ，将对象作为弹性伸缩盒子模型显示 。*/
  117 + // -webkit-line-clamp: 2;/*用来限制在一个块元素显示的文本的行数。*/
  118 + // -webkit-box-orient: vertical;/*必须结合的属性 ，设置或检索伸缩盒对象的子元素的排*/
  119 + line-height: 30rpx;
  120 + margin: 10rpx 0;
  121 + padding: 0 10rpx;
  122 + }
  123 + .business-card-item {
  124 + padding: 0 10rpx;
  125 + font-weight: 400;
  126 + font-size: 20rpx;
  127 + color: #676767;
  128 + line-height: 1.5;
  129 + span {
  130 + font-weight: 700;
  131 + font-size: 30rpx;
  132 + color: #000000;
  133 + }
  134 + }
  135 + }
  136 + }
  137 + }
  138 +}
  139 +
  140 +/* 底部 */
  141 +.page-footer{
  142 + position: fixed;
  143 + left: 0;
  144 + bottom: 0;
  145 + display: flex;
  146 + align-items: center;
  147 + justify-content: center;
  148 + width: 100%;
  149 + height: 60px;
  150 + background-color: #FFFFFF;
  151 +
  152 + .footer-btn {
  153 + display: flex;
  154 + width: 90%;
  155 + }
  156 + .footer-service {
  157 + display: flex;
  158 + flex-direction: column;
  159 + align-items: center;
  160 + text {
  161 + margin-top: 6rpx;
  162 + line-height: 32rpx;
  163 + }
  164 + }
  165 +}
0 \ No newline at end of file 166 \ No newline at end of file
lvdao-miniapp/pages/orderList/inventory.vue
  View file @0c19043
1 <template> 1 <template>
  2 + <view class="page">
  3 + <!-- <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs> -->
  4 + <view style="padding: 0 20rpx;">
  5 + <view v-for="(item,index) in alllist" :key="index" @click="gopath('/pages/orderList/inventorydetails',item.orderId)"
  6 + style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;">
  7 + <view style="display: flex;">
  8 + <view>
  9 + <image style="width: 200rpx;height: 200rpx;bitem-radius: 18rpx;overflow: hidden;" mode="aspectFill"
  10 + :src="imgurl+item.productImage"></image>
  11 + </view>
  12 + <view style="display: flex;flex-direction: column;justify-content: space-between;margin-left: 15rpx;">
  13 + <view>{{item.productName}}</view>
  14 + <view class="t1">售价区间：{{ item.section }}</view>
  15 + <view class="t1">会员价：{{ item.memberSection || '-'}}</view>
  16 + <view class="t1">积分兑换：{{item.ifCredit=='1'?'允许':item.ifCredit=='0'?'不允许':'-'}}</view>
  17 + </view>
  18 + </view>
  19 + <view style="display: flex;justify-content: space-between;">
  20 + <view class="t1">库存：{{ item.stockNumber }}</view>
  21 + <view class="t1">销量：{{ item.volume }}</view>
  22 + </view>
  23 + <view style="display: flex;justify-content: space-between;">
  24 + <view class="t1">上架状态：{{item.shelveState=='0'?'未上架':item.shelveState=='1'?'已上架':item.shelveState=='2'?'待审核':item.shelveState=='3'?'审核失败':'-'}}</view>
  25 + <view class="t1">登记状态：{{item.registrationStatus=='1'?'已入库':'未入库'}}</view>
  26 + </view>
  27 + <view class="t1">驳回原因：{{ item.reject || '-'}}</view>
  28 + </view>
  29 + </view>
  30 + </view>
  31 + </view>
2 </template> 32 </template>
3 33
4 <script> 34 <script>
  35 + export default {
  36 + data() {
  37 + return {
  38 + list: [
  39 + {
  40 + type:'',
  41 + name: '全部'
  42 + },
  43 + {
  44 + type:'1',
  45 + name: '待付款'
  46 + },
  47 + {
  48 + type:'2',
  49 + name: '待发货',
  50 + },
  51 + {
  52 + type:'3',
  53 + name: '已发货',
  54 + },
  55 + {
  56 + type:'4',
  57 + name: '已完成',
  58 + },
  59 + {
  60 + type:'5',
  61 + name: '已关闭',
  62 + },
  63 + ],
  64 + current: 0,
  65 + alllist: [],
  66 + pageindex: {
  67 + page: 1,
  68 + pageSize: 10,
  69 + state:''
  70 + },
  71 + imgurl: '',
  72 + total:0
  73 + };
  74 + },
  75 + onLoad(optiong) {
  76 + this.imgurl = this.$img
  77 + this.getALL()
  78 + // this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => {
  79 + // //成功回调
  80 + // this.list = res.data.data.list
  81 + // })
  82 + },
  83 + onReachBottom (e){
  84 + console.error(e)
  85 + if (this.alllist.length < this.total) {
  86 + this.pageindex.page++
  87 + this.getALL()
  88 + }
  89 + },
  90 + methods: {
  91 + gopath(url,id){
  92 + uni.navigateTo({
  93 + url:url+'?id='+id
  94 + })
  95 + },
  96 + getALL() {
  97 + this.$http.sendRequest('/product/getAll', 'POST', this.pageindex,2).then(res => {
  98 + //成功回调
  99 + this.alllist = [...this.alllist,...res.data.data.list]
  100 + this.total = res.data.data.total
  101 + console.error(this.alllist)
  102 + })
  103 + },
  104 + change(index) {
  105 + this.current = index;
  106 + if(this.current == 0) {
  107 + this.pageindex.state = ''
  108 + } else {
  109 + this.pageindex.state = this.list[this.current].type
  110 + }
  111 + this.pageindex.page = 1
  112 + this.alllist = []
  113 + this.getALL()
  114 + }
  115 +
  116 + }
  117 + }
5 </script> 118 </script>
6 119
7 -<style> 120 +<style scoped lang="scss">
  121 + .page {}
  122 +
  123 + .t1 {
  124 + font-size: 26rpx;
  125 + color: #979797;
  126 + line-height: 50rpx;
  127 + }
8 </style> 128 </style>
9 \ No newline at end of file 129 \ No newline at end of file
lvdao-miniapp/pages/orderList/inventorydetails.vue 0 → 100644
  View file @0c19043
  1 +<!-- 订单详情 -->
  2 +<template>
  3 + <view>
  4 + <view>
  5 + <view class="content" style="padding-bottom:200upx;">
  6 + <view class="order-details-info-box">
  7 +
  8 + <view class="order-list-box">
  9 + <view class="item">
  10 + <view class="order-list-top">
  11 + <view class="top-l" >
  12 + <image
  13 + src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/orderStoreIcon.png"
  14 + class="shop-img"></image>
  15 + <text class="shop-name">{{ dataList.shopName }}</text>
  16 + </view>
  17 +
  18 + </view>
  19 + <view class="order-info-box">
  20 + <view class="order-info">
  21 + <view class="order-info-item" v-for="proItem in dataList.products"
  22 + :key="proItem.productId">
  23 + <image :src="imgurl+proItem.image" class="product-img default-img"></image>
  24 + <view class="info-box">
  25 + <text class="product-name">{{ proItem.productName }}</text>
  26 + <view class="price-sku-box">
  27 + <view class="product-sku">
  28 + <view class="mar-left-20" v-for="vItem in proItem.values">
  29 + <text>规格：{{ vItem }}</text>
  30 + </view>
  31 + </view>
  32 + <view class="product-num">x {{ proItem.number }}</view>
  33 + </view>
  34 + </view>
  35 + </view>
  36 + <view class="delivery-way-box">
  37 + <view class="item">
  38 + <text class="way">商品总价</text>
  39 + <text class="way">¥{{ dataList.orderPrice }}</text>
  40 + </view>
  41 + <view class="item">
  42 + <text class="way">快递运费</text>
  43 + <text class="way">¥{{ dataList.logisticsPrice }}</text>
  44 + </view>
  45 + </view>
  46 + </view>
  47 + <!-- 待发货 待收货 已完成 -->
  48 + <view class="order-total-box"
  49 + v-if='dataList.state==2||dataList.state==3||dataList.state==4'>
  50 + <text>实付款</text>
  51 + <text class="way-color">¥{{ dataList.price }}</text>
  52 + </view>
  53 + <!-- 待付款 价格是橙色-->
  54 + <view class="order-total-box" v-else-if="dataList.state==1">
  55 + <text>需付款</text>
  56 + <text class="way-color">¥{{ dataList.price }}</text>
  57 + </view>
  58 + <!-- 退款成功 交易关闭 -->
  59 + <view class="order-total-box"
  60 + v-else-if="(dataList.returnType==1 && dataList.moneyReturnList.status==4) || (dataList.returnType==2 && dataList.goodsReturn.status==6) || (dataList.state==5)">
  61 + <text>需付款</text>
  62 + <text>¥{{ dataList.price }}</text>
  63 + </view>
  64 + </view>
  65 + </view>
  66 + </view>
  67 + </view>
  68 + <view class="order-details-information padd">
  69 + <view class="order-title">
  70 + <text>订单信息</text>
  71 + </view>
  72 + <view class="info-box">
  73 + <!--都有 但是：待付款 待发货 退款成功 交易关闭 只有前两个item-->
  74 + <view class="item">
  75 + <text>订单编号：{{ dataList.orderFormid }}</text>
  76 + <text class="copy-color" :data-clipboard-text="dataList.orderFormid" @click="copy">复制</text>
  77 + </view>
  78 + <view class="item">
  79 + <text>创建时间：{{ dataList.createTime }}</text>
  80 + </view>
  81 + <!-- 待收货 有付款时间和发货时间 -->
  82 + <view class="item" v-if="dataList.state==3">
  83 + <text>付款时间：{{ dataList.paymentTime }}</text>
  84 + </view>
  85 + <!-- <view class="item" v-if="dataList.state == 3 || dataList.state == 4">
  86 + <text>发货时间：{{ dataList.dileveryTime }}</text>
  87 + </view> -->
  88 + <!-- 交易成功 有成交时间-->
  89 + <!-- <view class="item" v-if="dataList.state == 4">
  90 + <text>成交时间：{{ dataList.receiveTime }}</text>
  91 + </view> -->
  92 + </view>
  93 + </view>
  94 +
  95 +
  96 + </view>
  97 +
  98 +
  99 +
  100 + </view>
  101 + </view>
  102 +</template>
  103 +
  104 +<script>
  105 + export default {
  106 +
  107 + data() {
  108 + return {
  109 + dataList: {
  110 + orderFormid: null,
  111 + createTime: null,
  112 + orderPrice: 0,
  113 + logisticsPrice: 0,
  114 + discountPrice: 0
  115 + },
  116 + imgurl: '',
  117 +
  118 +
  119 +
  120 +
  121 + }
  122 + },
  123 +
  124 + onShow() {
  125 +
  126 + },
  127 + onLoad(options) {
  128 + this.imgurl = this.$img
  129 + console.log(options)
  130 + this.$http.sendRequest('/order/getById', 'POST', {
  131 + orderId: options.id
  132 + }, 1).then(res => {
  133 + this.dataList = res.data.data
  134 + })
  135 + return
  136 +
  137 + },
  138 +
  139 + methods: {
  140 + copy() {
  141 + // #ifdef H5
  142 + let clipboard = new ClipboardJS('.copy-color');
  143 + clipboard.on('success', function(e) {
  144 + uni.showToast({
  145 + title: '复制成功',
  146 + icon: 'success'
  147 + })
  148 + clipboard.destroy();
  149 + })
  150 + clipboard.on('error', function(e) {
  151 + uni.showToast({
  152 + title: '复制失败',
  153 + icon: 'success'
  154 + })
  155 + clipboard.destroy();
  156 + })
  157 + // #endif
  158 + // #ifndef H5
  159 + uni.setClipboardData({
  160 + data: this.dataList.orderFormid,
  161 + success: function() {
  162 + uni.showToast({
  163 + title: '复制成功',
  164 + icon: 'success'
  165 + })
  166 + }
  167 + });
  168 + // #endif
  169 + },
  170 +
  171 +
  172 + },
  173 +
  174 + }
  175 +</script>
  176 +
  177 +<style lang="scss" scoped>
  178 + page {
  179 + background: #f7f7f7;
  180 + }
  181 +
  182 + .logistics {
  183 + padding: 20upx 20upx;
  184 + }
  185 +
  186 + .content {
  187 + padding: 0 0 160upx 0;
  188 + }
  189 +
  190 + .order-details-status {
  191 + width: 750upx;
  192 + height: 250upx;
  193 + background: #333333;
  194 + }
  195 +
  196 + .status-title-box {
  197 + display: flex;
  198 + flex-direction: row;
  199 + align-items: center;
  200 + justify-content: center;
  201 + padding: 40upx 30upx 0;
  202 + box-sizing: border-box;
  203 + text-align: center;
  204 + }
  205 +
  206 + .status-title-box2 {
  207 + display: flex;
  208 + flex-direction: column;
  209 + align-items: center;
  210 + padding: 40upx 30upx 0;
  211 + box-sizing: border-box;
  212 + }
  213 +
  214 + .status-title-box .l {
  215 + display: flex;
  216 + flex-direction: column;
  217 + }
  218 +
  219 + .status-title-box .l .status,
  220 + .status-title-box2 .status {
  221 + font-size: 30upx;
  222 + color: #fff;
  223 + }
  224 +
  225 + .status-title-box .l .label,
  226 + .status-title-box2 .label {
  227 + font-size: 24upx;
  228 + color: #fff;
  229 + margin-top: 14upx;
  230 + }
  231 +
  232 + .status-title-box .r {
  233 + width: 80upx;
  234 + height: 80upx;
  235 + }
  236 +
  237 + .order-details-info-box {
  238 + padding: 0 30upx;
  239 + box-sizing: border-box;
  240 + // margin-top: -80upx;
  241 + }
  242 +
  243 + .address-box {
  244 + margin-top: 20upx;
  245 + background: #fff;
  246 + width: 100%;
  247 + padding: 30upx;
  248 + box-sizing: border-box;
  249 + display: flex;
  250 + flex-direction: row;
  251 + align-items: center;
  252 + }
  253 +
  254 + .address-box .address-img {
  255 + width: 70upx;
  256 + height: 70upx;
  257 + margin-right: 20upx;
  258 + }
  259 +
  260 + .address-box .address-r {
  261 + flex: 1;
  262 + display: flex;
  263 + flex-direction: column;
  264 + font-size: 28upx;
  265 + color: #333;
  266 + }
  267 +
  268 + .arrow-right-img {
  269 + width: 24upx;
  270 + height: 24upx;
  271 + margin-left: 20upx;
  272 + }
  273 +
  274 + .address-name-box {
  275 + font-size: 30upx;
  276 + color: #333;
  277 + }
  278 +
  279 + .phone {
  280 + font-size: 24upx;
  281 + color: #999;
  282 + margin-left: 20upx;
  283 + }
  284 +
  285 + .address-info {
  286 + font-size: 28upx;
  287 + color: #333;
  288 + margin-top: 15upx;
  289 + }
  290 +
  291 + .order-list-box {
  292 + margin-top: 20upx;
  293 +
  294 + .toService {
  295 + line-height: 40rpx;
  296 + padding: 0 8rpx;
  297 + border: 1rpx solid #FAF6ED;
  298 + cursor: pointer;
  299 + display: flex;
  300 + align-items: center;
  301 +
  302 + .service-img {
  303 + width: 60upx;
  304 + height: 60upx;
  305 + margin-right: 12rpx;
  306 + }
  307 +
  308 + text {
  309 + line-height: 40rpx;
  310 + }
  311 + }
  312 + }
  313 +
  314 + .order-list-box .item {
  315 + margin-bottom: 20upx;
  316 + background: #fff;
  317 + }
  318 +
  319 + .order-list-top {
  320 + height: 96upx;
  321 + padding: 0 30upx;
  322 + box-sizing: border-box;
  323 + display: flex;
  324 + flex-direction: row;
  325 + align-items: center;
  326 + justify-content: space-between;
  327 + border-bottom: 1px solid #eee;
  328 + }
  329 +
  330 + .top-l {
  331 + display: flex;
  332 + flex-direction: row;
  333 + align-items: center;
  334 + }
  335 +
  336 + .shop-img {
  337 + width: 34upx;
  338 + height: 34upx;
  339 + margin-right: 10upx;
  340 + }
  341 +
  342 + .shop-name {
  343 + font-size: 30upx;
  344 + color: #333;
  345 + font-weight: bold;
  346 + }
  347 +
  348 + .arrow-img {
  349 + margin-left: 15upx;
  350 + width: 24upx;
  351 + height: 24upx;
  352 + }
  353 +
  354 + .order-info-box {
  355 + padding: 0 30upx;
  356 + box-sizing: border-box;
  357 + }
  358 +
  359 + .order-info {
  360 + border-bottom: 1px solid #eee;
  361 + }
  362 +
  363 + .order-info-item {
  364 + display: flex;
  365 + flex-direction: row;
  366 + padding: 20upx 0;
  367 + }
  368 +
  369 + .product-img {
  370 + width: 180upx;
  371 + height: 180upx;
  372 + border-radius: 10upx;
  373 + margin-right: 30upx;
  374 + }
  375 +
  376 + .info-box {
  377 + flex: 1;
  378 + display: flex;
  379 + flex-direction: column;
  380 + justify-content: space-between;
  381 + }
  382 +
  383 + .product-name {
  384 + font-size: 26upx;
  385 + color: #333;
  386 + height: 68upx;
  387 + line-height: 34upx;
  388 + display: -webkit-box;
  389 + overflow: hidden;
  390 + text-overflow: ellipsis;
  391 + word-break: break-all;
  392 + -webkit-box-orient: vertical;
  393 + -webkit-line-clamp: 2;
  394 + }
  395 +
  396 + .price-sku-box {
  397 + width: 100%;
  398 + display: flex;
  399 + flex-direction: row;
  400 + align-items: center;
  401 + justify-content: space-between;
  402 + }
  403 +
  404 + .product-sku {
  405 + font-size: 24upx;
  406 + color: #999;
  407 + display: inline-block;
  408 + margin-left: -20upx;
  409 + display: flex;
  410 + flex-direction: row;
  411 + }
  412 +
  413 + .price-box {
  414 + display: flex;
  415 + flex-direction: column;
  416 + }
  417 +
  418 + .product-price1 {
  419 + font-size: 24upx;
  420 + color: #333;
  421 + font-weight: 400;
  422 + }
  423 +
  424 + .product-price2 {
  425 + font-size: 24upx;
  426 + color: #999;
  427 + text-decoration: line-through;
  428 + font-weight: 400;
  429 + }
  430 +
  431 + .product-price .fuhao {
  432 + font-size: 28upx;
  433 + }
  434 +
  435 + .item-applay-btn {
  436 + height: 50upx;
  437 + display: flex;
  438 + flex-direction: row;
  439 + align-items: center;
  440 + justify-content: center;
  441 + padding: 0 30upx;
  442 + background: rgba(255, 255, 255, 1);
  443 + border: 1px solid rgba(187, 187, 187, 1);
  444 + border-radius: 25upx;
  445 + font-size: 24upx;
  446 + font-weight: 400;
  447 + color: rgba(51, 51, 51, 1);
  448 + }
  449 +
  450 + .product-num {
  451 + font-size: 28upx;
  452 + color: #999;
  453 + display: inline-block;
  454 + }
  455 +
  456 + .delivery-way-box {
  457 + display: flex;
  458 + flex-direction: column;
  459 + margin: 30upx 0 10upx;
  460 + }
  461 +
  462 + .delivery-way-box .item {
  463 + display: flex;
  464 + flex-direction: row;
  465 + align-items: center;
  466 + justify-content: space-between;
  467 + font-size: 26upx;
  468 + color: #333;
  469 + }
  470 +
  471 + .delivery-way-box .item .way {
  472 + color: #999;
  473 + }
  474 +
  475 + .order-total-box {
  476 + padding: 30upx 0;
  477 + display: flex;
  478 + flex-direction: row;
  479 + align-items: center;
  480 + justify-content: space-between;
  481 + font-size: 26upx;
  482 + color: #333;
  483 + }
  484 +
  485 + .order-total-box .way-color {
  486 + color: #333333;
  487 + font-size: 32rpx;
  488 + }
  489 +
  490 + .order-details-information {
  491 + background: #fff;
  492 + }
  493 +
  494 + .order-details-information.padd {
  495 + padding: 30upx;
  496 + margin: 0 30upx;
  497 + box-sizing: border-box;
  498 + }
  499 +
  500 + .order-details-information .order-title {
  501 + font-size: 30upx;
  502 + color: #333;
  503 + font-weight: 500;
  504 + display: flex;
  505 + flex-direction: row;
  506 + align-items: center;
  507 + }
  508 +
  509 + .order-details-information .info-box {
  510 + margin-top: 30upx;
  511 + }
  512 +
  513 + .order-details-information .info-box .item {
  514 + display: flex;
  515 + flex-direction: row;
  516 + align-items: center;
  517 + justify-content: space-between;
  518 + font-size: 24upx;
  519 + color: #666;
  520 + margin-bottom: 20upx;
  521 + }
  522 +
  523 + .order-details-information .info-box .item .copy-color {
  524 + font-size: 24upx;
  525 + color: #C5AA7B;
  526 + }
  527 +
  528 + .order-details-btn {
  529 + position: fixed;
  530 + bottom: 0;
  531 + left: 0;
  532 + width: 100%;
  533 + min-height: 160upx;
  534 + background: #fff;
  535 + box-shadow: 0px 0px 10px 0px rgba(51, 51, 51, 0.1);
  536 + box-sizing: border-box;
  537 + display: flex;
  538 + padding: 0 30upx;
  539 + flex-direction: row;
  540 + align-items: center;
  541 + justify-content: space-between;
  542 + z-index: 10;
  543 + }
  544 +
  545 + .order-details-btn .btn {
  546 + width: 100%;
  547 + height: 100upx;
  548 + background: #333333;
  549 + font-size: 28upx;
  550 + color: #FFEBC4;
  551 + text-align: center;
  552 + line-height: 100upx;
  553 + font-weight: 500upx;
  554 + }
  555 +
  556 + .order-details-btn .btn-l {
  557 + width: 50%;
  558 + height: 100upx;
  559 + border: 2rpx solid #333333;
  560 + font-size: 28upx;
  561 + color: #333;
  562 + text-align: center;
  563 + line-height: 100upx;
  564 + box-sizing: border-box;
  565 + margin-right: 10rpx;
  566 + }
  567 +
  568 + .order-details-btn .btn-r {
  569 + width: 50%;
  570 + margin-left: 10rpx;
  571 + }
  572 +
  573 + .mt20 {
  574 + margin-top: 20upx;
  575 + }
  576 +
  577 + .order-title-box {
  578 + display: flex;
  579 + flex-direction: row;
  580 + align-items: center;
  581 + justify-content: space-between;
  582 + }
  583 +
  584 + .order-details-information .order-title-box .order-title.padd-l {
  585 + padding-left: 30upx;
  586 + }
  587 +
  588 + .arrow-down-img {
  589 + width: 40upx;
  590 + height: 40upx;
  591 + margin: 30upx;
  592 + box-sizing: border-box;
  593 + }
  594 +
  595 + .evaluate {
  596 + height: 56upx;
  597 + border-radius: 28upx;
  598 + text-align: center;
  599 + line-height: 56upx;
  600 + font-size: 26upx;
  601 + padding: 0 30upx;
  602 + border: 1px solid #C5AA7B;
  603 + color: #C5AA7B;
  604 + }
  605 +
  606 + .evaluate2 {
  607 + height: 56upx;
  608 + border-radius: 28upx;
  609 + text-align: center;
  610 + line-height: 56upx;
  611 + font-size: 26upx;
  612 + padding: 0 30upx;
  613 + border: 1px solid #BBBBBB;
  614 + color: #333;
  615 + }
  616 +
  617 + .emptyOrder-box {
  618 + padding: 70upx 0;
  619 +
  620 + .emptyOrder-img {
  621 + width: 200upx;
  622 + height: 200upx;
  623 + }
  624 + }
  625 +
  626 + .pay-type-item {
  627 + .pay-type-radio {
  628 + background-color: white;
  629 + border-bottom: 1upx solid #EDEDED;
  630 + margin-bottom: 20upx;
  631 + padding: 24upx 20upx 24upx 20upx;
  632 +
  633 + .pay-type-img {
  634 + display: inline-block;
  635 +
  636 + .pay-type-img-inner {
  637 + width: 50upx;
  638 + height: 50upx;
  639 + vertical-align: middle;
  640 + }
  641 + }
  642 +
  643 + .pay-type-label {
  644 + vertical-align: middle;
  645 + margin-left: 30upx;
  646 + }
  647 +
  648 + .pay-type-radio-item {
  649 + float: right;
  650 + margin-right: 20upx;
  651 + width: 50upx;
  652 + height: 50upx;
  653 + }
  654 + }
  655 +
  656 + .huabei-detail {
  657 + margin-top: 20upx;
  658 +
  659 + .fenqi-wenzi {
  660 + display: inline-block;
  661 + margin-left: 64upx;
  662 + }
  663 +
  664 + .fenqi-amount {
  665 + display: block;
  666 + margin-left: 64upx;
  667 + margin-top: 14upx;
  668 + color: #BABBBC;
  669 + }
  670 +
  671 + .fenqi-charge-fee {
  672 + float: right;
  673 + margin-right: 68upx;
  674 + color: #BABBBC;
  675 + }
  676 +
  677 + .fenqi-modal {
  678 + width: 40upx;
  679 + height: 40upx;
  680 + margin-left: 20upx;
  681 + float: right;
  682 + position: relative;
  683 + top: -80upx;
  684 + }
  685 + }
  686 + }
  687 +
  688 + .paytype-confirm {
  689 + height: 120upx;
  690 + padding: 0upx 108upx 0upx 32upx;
  691 +
  692 + .fenqi-all {
  693 + display: inline-block;
  694 + width: 100%;
  695 + }
  696 +
  697 + .fenqi-total-amount {
  698 + width: 65%;
  699 + float: left;
  700 + }
  701 +
  702 + .fenqi-confirm {
  703 + float: right;
  704 + width: 160upx;
  705 + padding: 0upx 20upx;
  706 +
  707 + .btn {
  708 + width: 216upx;
  709 + height: 80upx;
  710 + line-height: 80upx;
  711 + border-radius: 40upx;
  712 + font-size: 28upx;
  713 + text-align: center;
  714 + background: linear-gradient(90deg, rgba(255, 162, 0, 1), rgba(255, 121, 17, 1));
  715 + color: #fff;
  716 + display: inline-block;
  717 + margin-right: 66upx;
  718 + }
  719 + }
  720 + }
  721 +
  722 + .period-radio {
  723 + margin: 30upx;
  724 + padding-right: 100upx;
  725 + width: 95%;
  726 + border-bottom: 1px solid #EFEFEF;
  727 +
  728 + .period-amount {
  729 + display: inline-block;
  730 +
  731 + .period-each-charge {
  732 + display: inline-block;
  733 + margin-top: 12upx;
  734 + margin-left: 6upx;
  735 + font-size: 26upx;
  736 + color: #b7b7b7;
  737 + margin-bottom: 13upx;
  738 + }
  739 + }
  740 +
  741 + .period-each {
  742 + display: block;
  743 + }
  744 +
  745 + .period-type-radio-item {
  746 + float: right;
  747 + }
  748 + }
  749 +</style>
0 \ No newline at end of file 750 \ No newline at end of file
lvdao-miniapp/pages/orderList/orderList.vue
  View file @0c19043
@@ -2,41 +2,50 @@ @@ -2,41 +2,50 @@
2 <view class="page"> 2 <view class="page">
3 <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs> 3 <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs>
4 <view style="padding: 0 20rpx;"> 4 <view style="padding: 0 20rpx;">
5 - <view v-for="(item,index) in 10" 5 + <view v-for="(item,index) in alllist" :key="index" @click="gopath('/pages/orderList/orderListdetails',item.orderId)"
6 style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;"> 6 style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;">
7 - <view style="display: flex;align-items: center;justify-content: space-between;"> 7 + <view style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 20rpx;">
8 <view style="display: flex;align-items: center;"> 8 <view style="display: flex;align-items: center;">
9 - <view class="t1" style="margin-right: 15rpx;">订单号：131313</view> 9 + <view class="t1" style="margin-right: 15rpx;">订单号：{{item.orderId}}</view>
10 <u-icon name="arrow-right" color="#979797" size="24"></u-icon> 10 <u-icon name="arrow-right" color="#979797" size="24"></u-icon>
11 </view> 11 </view>
12 - <view class="t1">待付款</view> 12 + <view class="t1">
  13 + <span v-if="item.state === 1">待付款</span>
  14 + <span v-if="item.state === 2">待发货</span>
  15 + <span v-if="item.state === 3">待收货</span>
  16 + <span v-if="item.state === 4">已完成</span>
  17 + <span v-if="item.state === 5">已关闭</span>
  18 + </view>
13 </view> 19 </view>
14 - <view style="display: flex;justify-content: space-between;align-items: center;margin: 10rpx 0;"> 20 + <view v-for="(item1,index1) in item.products" :key="index1"
  21 + style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 20rpx;">
15 <view style="display: flex;"> 22 <view style="display: flex;">
16 <view> 23 <view>
17 - <image style="width: 200rpx;height: 200rpx;border-radius: 18rpx;" mode="aspectFill"  
18 - src="../../static/icon/bg1.png"></image> 24 + <image style="width: 200rpx;height: 200rpx;bitem-radius: 18rpx;overflow: hidden;" mode="aspectFill"
  25 + :src="imgurl+item1.image"></image>
19 </view> 26 </view>
20 <view 27 <view
21 - style="display: flex;flex-direction: column;justify-content: space-around;margin-left: 15rpx;">  
22 - <view>产品名称</view>  
23 - <view class="t1">下单时间：11312</view> 28 + style="display: flex;flex-direction: column;justify-content: space-between;margin-left: 15rpx;">
  29 + <view>{{item1.productName}}</view>
  30 + <view v-if="item1.value">规格：{{ item1.value }}</view>
24 </view> 31 </view>
25 </view> 32 </view>
26 - <view style="display: flex;flex-direction: column;justify-content: space-around;height: 200rpx;">  
27 - <view class="t1">￥444</view>  
28 - <view class="t1">X1</view> 33 + <view style="display: flex;flex-direction: column;justify-content: space-between;height: 200rpx;text-align: right;">
  34 + <view class="t1">￥ {{item1.productPrice*item1.number}}</view>
  35 + <view class="t1">X{{ item1.number }}</view>
29 </view> 36 </view>
30 </view> 37 </view>
31 <view 38 <view
32 style="display: flex;justify-content: space-between;padding-top: 30rpx;border-top: 2rpx solid #eee;align-items: center;"> 39 style="display: flex;justify-content: space-between;padding-top: 30rpx;border-top: 2rpx solid #eee;align-items: center;">
33 <view> 40 <view>
34 - <text>共1件商品，合计 </text>  
35 - <text style="color: red;font-weight: bold;">￥49</text> 41 + 共{{item.products.length}}件商品，合计
  42 + <text style="color: red;">¥{{ item.price }}</text>
36 </view> 43 </view>
37 - <view  
38 - style="background: #26c570;color: #fff;border-radius: 36rpx;font-size: 20rpx;padding: 14rpx 20rpx;">  
39 - 查看详情</view> 44 + <!-- 下单时间： -->
  45 + <view class="t1">{{item.createTime}}</view>
  46 + <!-- <view
  47 + style="background: #26c570;color: #fff;bitem-radius: 36rpx;font-size: 20rpx;padding: 14rpx 20rpx;">
  48 + 查看详情</view> -->
40 </view> 49 </view>
41 </view> 50 </view>
42 </view> 51 </view>
@@ -49,47 +58,80 @@ @@ -49,47 +58,80 @@
49 return { 58 return {
50 list: [ 59 list: [
51 { 60 {
  61 + type:'',
52 name: '全部' 62 name: '全部'
53 - }, 63 + },
54 { 64 {
  65 + type:'1',
55 name: '待付款' 66 name: '待付款'
56 - }, 67 + },
57 { 68 {
  69 + type:'2',
58 name: '待发货', 70 name: '待发货',
59 }, 71 },
60 { 72 {
  73 + type:'3',
61 name: '已发货', 74 name: '已发货',
62 }, 75 },
63 { 76 {
  77 + type:'4',
64 name: '已完成', 78 name: '已完成',
65 }, 79 },
66 { 80 {
  81 + type:'5',
67 name: '已关闭', 82 name: '已关闭',
68 }, 83 },
69 ], 84 ],
70 current: 0, 85 current: 0,
71 - 86 + alllist: [],
72 pageindex: { 87 pageindex: {
73 page: 1, 88 page: 1,
74 pageSize: 10, 89 pageSize: 10,
  90 + state:''
75 }, 91 },
  92 + imgurl: '',
  93 + total:0
76 }; 94 };
77 }, 95 },
78 - mounted() { 96 + onLoad(optiong) {
  97 + this.imgurl = this.$img
79 this.getALL() 98 this.getALL()
  99 + // this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => {
  100 + // //成功回调
  101 + // this.list = res.data.data.list
  102 + // })
80 }, 103 },
81 - onLoad(optiong) {  
82 - 104 + onReachBottom (e){
  105 + console.error(e)
  106 + if (this.alllist.length < this.total) {
  107 + this.pageindex.page++
  108 + this.getALL()
  109 + }
83 }, 110 },
84 methods: { 111 methods: {
  112 + gopath(url,id){
  113 + uni.navigateTo({
  114 + url:url+'?id='+id
  115 + })
  116 + },
85 getALL() { 117 getALL() {
86 - // this.$http.sendRequest('/order/getAll', 'POST', this.pageindex, 2).then(res => {  
87 - // //成功回调  
88 - // this.list = res.data.data.list  
89 - // }) 118 + this.$http.sendRequest('/order/getAll', 'POST', this.pageindex, 1).then(res => {
  119 + //成功回调
  120 + this.alllist = [...this.alllist,...res.data.data.list]
  121 + this.total = res.data.data.total
  122 + console.error(this.alllist)
  123 + })
90 }, 124 },
91 change(index) { 125 change(index) {
92 this.current = index; 126 this.current = index;
  127 + if(this.current == 0) {
  128 + this.pageindex.state = ''
  129 + } else {
  130 + this.pageindex.state = this.list[this.current].type
  131 + }
  132 + this.pageindex.page = 1
  133 + this.alllist = []
  134 + this.getALL()
93 } 135 }
94 136
95 } 137 }
@@ -97,9 +139,7 @@ @@ -97,9 +139,7 @@
97 </script> 139 </script>
98 140
99 <style scoped lang="scss"> 141 <style scoped lang="scss">
100 - .page {  
101 -  
102 - } 142 + .page {}
103 143
104 .t1 { 144 .t1 {
105 font-size: 26rpx; 145 font-size: 26rpx;
lvdao-miniapp/pages/orderList/orderListdetails.vue 0 → 100644
  View file @0c19043
  1 +<!-- 订单详情 -->
  2 +<template>
  3 + <view>
  4 + <view>
  5 + <view class="content" style="padding-bottom:200upx;">
  6 + <view class="order-details-info-box">
  7 +
  8 + <view class="order-list-box">
  9 + <view class="item">
  10 + <view class="order-list-top">
  11 + <view class="top-l" >
  12 + <image
  13 + src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/orderStoreIcon.png"
  14 + class="shop-img"></image>
  15 + <text class="shop-name">{{ dataList.shopName }}</text>
  16 + </view>
  17 +
  18 + </view>
  19 + <view class="order-info-box">
  20 + <view class="order-info">
  21 + <view class="order-info-item" v-for="proItem in dataList.products"
  22 + :key="proItem.productId">
  23 + <image :src="imgurl+proItem.image" class="product-img default-img"></image>
  24 + <view class="info-box">
  25 + <text class="product-name">{{ proItem.productName }}</text>
  26 + <view class="price-sku-box">
  27 + <view class="product-sku">
  28 + <view class="mar-left-20" v-for="vItem in proItem.values">
  29 + <text>规格：{{ vItem }}</text>
  30 + </view>
  31 + </view>
  32 + <view class="product-num">x {{ proItem.number }}</view>
  33 + </view>
  34 + </view>
  35 + </view>
  36 + <view class="delivery-way-box">
  37 + <view class="item">
  38 + <text class="way">商品总价</text>
  39 + <text class="way">¥{{ dataList.orderPrice }}</text>
  40 + </view>
  41 + <view class="item">
  42 + <text class="way">快递运费</text>
  43 + <text class="way">¥{{ dataList.logisticsPrice }}</text>
  44 + </view>
  45 + </view>
  46 + </view>
  47 + <!-- 待发货 待收货 已完成 -->
  48 + <view class="order-total-box"
  49 + v-if='dataList.state==2||dataList.state==3||dataList.state==4'>
  50 + <text>实付款</text>
  51 + <text class="way-color">¥{{ dataList.price }}</text>
  52 + </view>
  53 + <!-- 待付款 价格是橙色-->
  54 + <view class="order-total-box" v-else-if="dataList.state==1">
  55 + <text>需付款</text>
  56 + <text class="way-color">¥{{ dataList.price }}</text>
  57 + </view>
  58 + <!-- 退款成功 交易关闭 -->
  59 + <view class="order-total-box"
  60 + v-else-if="(dataList.returnType==1 && dataList.moneyReturnList.status==4) || (dataList.returnType==2 && dataList.goodsReturn.status==6) || (dataList.state==5)">
  61 + <text>需付款</text>
  62 + <text>¥{{ dataList.price }}</text>
  63 + </view>
  64 + </view>
  65 + </view>
  66 + </view>
  67 + </view>
  68 + <view class="order-details-information padd">
  69 + <view class="order-title">
  70 + <text>订单信息</text>
  71 + </view>
  72 + <view class="info-box">
  73 + <!--都有 但是：待付款 待发货 退款成功 交易关闭 只有前两个item-->
  74 + <view class="item">
  75 + <text>订单编号：{{ dataList.orderFormid }}</text>
  76 + <text class="copy-color" :data-clipboard-text="dataList.orderFormid" @click="copy">复制</text>
  77 + </view>
  78 + <view class="item">
  79 + <text>创建时间：{{ dataList.createTime }}</text>
  80 + </view>
  81 + <!-- 待收货 有付款时间和发货时间 -->
  82 + <view class="item" v-if="dataList.state==3">
  83 + <text>付款时间：{{ dataList.paymentTime }}</text>
  84 + </view>
  85 + <!-- <view class="item" v-if="dataList.state == 3 || dataList.state == 4">
  86 + <text>发货时间：{{ dataList.dileveryTime }}</text>
  87 + </view> -->
  88 + <!-- 交易成功 有成交时间-->
  89 + <!-- <view class="item" v-if="dataList.state == 4">
  90 + <text>成交时间：{{ dataList.receiveTime }}</text>
  91 + </view> -->
  92 + </view>
  93 + </view>
  94 +
  95 +
  96 + </view>
  97 +
  98 +
  99 +
  100 + </view>
  101 + </view>
  102 +</template>
  103 +
  104 +<script>
  105 + export default {
  106 +
  107 + data() {
  108 + return {
  109 + dataList: {
  110 + orderFormid: null,
  111 + createTime: null,
  112 + orderPrice: 0,
  113 + logisticsPrice: 0,
  114 + discountPrice: 0
  115 + },
  116 + imgurl: '',
  117 +
  118 +
  119 +
  120 +
  121 + }
  122 + },
  123 +
  124 + onShow() {
  125 +
  126 + },
  127 + onLoad(options) {
  128 + this.imgurl = this.$img
  129 + console.log(options)
  130 + this.$http.sendRequest('/order/getById', 'POST', {
  131 + orderId: options.id
  132 + }, 1).then(res => {
  133 + this.dataList = res.data.data
  134 + })
  135 + return
  136 +
  137 + },
  138 +
  139 + methods: {
  140 + copy() {
  141 + // #ifdef H5
  142 + let clipboard = new ClipboardJS('.copy-color');
  143 + clipboard.on('success', function(e) {
  144 + uni.showToast({
  145 + title: '复制成功',
  146 + icon: 'success'
  147 + })
  148 + clipboard.destroy();
  149 + })
  150 + clipboard.on('error', function(e) {
  151 + uni.showToast({
  152 + title: '复制失败',
  153 + icon: 'success'
  154 + })
  155 + clipboard.destroy();
  156 + })
  157 + // #endif
  158 + // #ifndef H5
  159 + uni.setClipboardData({
  160 + data: this.dataList.orderFormid,
  161 + success: function() {
  162 + uni.showToast({
  163 + title: '复制成功',
  164 + icon: 'success'
  165 + })
  166 + }
  167 + });
  168 + // #endif
  169 + },
  170 +
  171 +
  172 + },
  173 +
  174 + }
  175 +</script>
  176 +
  177 +<style lang="scss" scoped>
  178 + page {
  179 + background: #f7f7f7;
  180 + }
  181 +
  182 + .logistics {
  183 + padding: 20upx 20upx;
  184 + }
  185 +
  186 + .content {
  187 + padding: 0 0 160upx 0;
  188 + }
  189 +
  190 + .order-details-status {
  191 + width: 750upx;
  192 + height: 250upx;
  193 + background: #333333;
  194 + }
  195 +
  196 + .status-title-box {
  197 + display: flex;
  198 + flex-direction: row;
  199 + align-items: center;
  200 + justify-content: center;
  201 + padding: 40upx 30upx 0;
  202 + box-sizing: border-box;
  203 + text-align: center;
  204 + }
  205 +
  206 + .status-title-box2 {
  207 + display: flex;
  208 + flex-direction: column;
  209 + align-items: center;
  210 + padding: 40upx 30upx 0;
  211 + box-sizing: border-box;
  212 + }
  213 +
  214 + .status-title-box .l {
  215 + display: flex;
  216 + flex-direction: column;
  217 + }
  218 +
  219 + .status-title-box .l .status,
  220 + .status-title-box2 .status {
  221 + font-size: 30upx;
  222 + color: #fff;
  223 + }
  224 +
  225 + .status-title-box .l .label,
  226 + .status-title-box2 .label {
  227 + font-size: 24upx;
  228 + color: #fff;
  229 + margin-top: 14upx;
  230 + }
  231 +
  232 + .status-title-box .r {
  233 + width: 80upx;
  234 + height: 80upx;
  235 + }
  236 +
  237 + .order-details-info-box {
  238 + padding: 0 30upx;
  239 + box-sizing: border-box;
  240 + // margin-top: -80upx;
  241 + }
  242 +
  243 + .address-box {
  244 + margin-top: 20upx;
  245 + background: #fff;
  246 + width: 100%;
  247 + padding: 30upx;
  248 + box-sizing: border-box;
  249 + display: flex;
  250 + flex-direction: row;
  251 + align-items: center;
  252 + }
  253 +
  254 + .address-box .address-img {
  255 + width: 70upx;
  256 + height: 70upx;
  257 + margin-right: 20upx;
  258 + }
  259 +
  260 + .address-box .address-r {
  261 + flex: 1;
  262 + display: flex;
  263 + flex-direction: column;
  264 + font-size: 28upx;
  265 + color: #333;
  266 + }
  267 +
  268 + .arrow-right-img {
  269 + width: 24upx;
  270 + height: 24upx;
  271 + margin-left: 20upx;
  272 + }
  273 +
  274 + .address-name-box {
  275 + font-size: 30upx;
  276 + color: #333;
  277 + }
  278 +
  279 + .phone {
  280 + font-size: 24upx;
  281 + color: #999;
  282 + margin-left: 20upx;
  283 + }
  284 +
  285 + .address-info {
  286 + font-size: 28upx;
  287 + color: #333;
  288 + margin-top: 15upx;
  289 + }
  290 +
  291 + .order-list-box {
  292 + margin-top: 20upx;
  293 +
  294 + .toService {
  295 + line-height: 40rpx;
  296 + padding: 0 8rpx;
  297 + border: 1rpx solid #FAF6ED;
  298 + cursor: pointer;
  299 + display: flex;
  300 + align-items: center;
  301 +
  302 + .service-img {
  303 + width: 60upx;
  304 + height: 60upx;
  305 + margin-right: 12rpx;
  306 + }
  307 +
  308 + text {
  309 + line-height: 40rpx;
  310 + }
  311 + }
  312 + }
  313 +
  314 + .order-list-box .item {
  315 + margin-bottom: 20upx;
  316 + background: #fff;
  317 + }
  318 +
  319 + .order-list-top {
  320 + height: 96upx;
  321 + padding: 0 30upx;
  322 + box-sizing: border-box;
  323 + display: flex;
  324 + flex-direction: row;
  325 + align-items: center;
  326 + justify-content: space-between;
  327 + border-bottom: 1px solid #eee;
  328 + }
  329 +
  330 + .top-l {
  331 + display: flex;
  332 + flex-direction: row;
  333 + align-items: center;
  334 + }
  335 +
  336 + .shop-img {
  337 + width: 34upx;
  338 + height: 34upx;
  339 + margin-right: 10upx;
  340 + }
  341 +
  342 + .shop-name {
  343 + font-size: 30upx;
  344 + color: #333;
  345 + font-weight: bold;
  346 + }
  347 +
  348 + .arrow-img {
  349 + margin-left: 15upx;
  350 + width: 24upx;
  351 + height: 24upx;
  352 + }
  353 +
  354 + .order-info-box {
  355 + padding: 0 30upx;
  356 + box-sizing: border-box;
  357 + }
  358 +
  359 + .order-info {
  360 + border-bottom: 1px solid #eee;
  361 + }
  362 +
  363 + .order-info-item {
  364 + display: flex;
  365 + flex-direction: row;
  366 + padding: 20upx 0;
  367 + }
  368 +
  369 + .product-img {
  370 + width: 180upx;
  371 + height: 180upx;
  372 + border-radius: 10upx;
  373 + margin-right: 30upx;
  374 + }
  375 +
  376 + .info-box {
  377 + flex: 1;
  378 + display: flex;
  379 + flex-direction: column;
  380 + justify-content: space-between;
  381 + }
  382 +
  383 + .product-name {
  384 + font-size: 26upx;
  385 + color: #333;
  386 + height: 68upx;
  387 + line-height: 34upx;
  388 + display: -webkit-box;
  389 + overflow: hidden;
  390 + text-overflow: ellipsis;
  391 + word-break: break-all;
  392 + -webkit-box-orient: vertical;
  393 + -webkit-line-clamp: 2;
  394 + }
  395 +
  396 + .price-sku-box {
  397 + width: 100%;
  398 + display: flex;
  399 + flex-direction: row;
  400 + align-items: center;
  401 + justify-content: space-between;
  402 + }
  403 +
  404 + .product-sku {
  405 + font-size: 24upx;
  406 + color: #999;
  407 + display: inline-block;
  408 + margin-left: -20upx;
  409 + display: flex;
  410 + flex-direction: row;
  411 + }
  412 +
  413 + .price-box {
  414 + display: flex;
  415 + flex-direction: column;
  416 + }
  417 +
  418 + .product-price1 {
  419 + font-size: 24upx;
  420 + color: #333;
  421 + font-weight: 400;
  422 + }
  423 +
  424 + .product-price2 {
  425 + font-size: 24upx;
  426 + color: #999;
  427 + text-decoration: line-through;
  428 + font-weight: 400;
  429 + }
  430 +
  431 + .product-price .fuhao {
  432 + font-size: 28upx;
  433 + }
  434 +
  435 + .item-applay-btn {
  436 + height: 50upx;
  437 + display: flex;
  438 + flex-direction: row;
  439 + align-items: center;
  440 + justify-content: center;
  441 + padding: 0 30upx;
  442 + background: rgba(255, 255, 255, 1);
  443 + border: 1px solid rgba(187, 187, 187, 1);
  444 + border-radius: 25upx;
  445 + font-size: 24upx;
  446 + font-weight: 400;
  447 + color: rgba(51, 51, 51, 1);
  448 + }
  449 +
  450 + .product-num {
  451 + font-size: 28upx;
  452 + color: #999;
  453 + display: inline-block;
  454 + }
  455 +
  456 + .delivery-way-box {
  457 + display: flex;
  458 + flex-direction: column;
  459 + margin: 30upx 0 10upx;
  460 + }
  461 +
  462 + .delivery-way-box .item {
  463 + display: flex;
  464 + flex-direction: row;
  465 + align-items: center;
  466 + justify-content: space-between;
  467 + font-size: 26upx;
  468 + color: #333;
  469 + }
  470 +
  471 + .delivery-way-box .item .way {
  472 + color: #999;
  473 + }
  474 +
  475 + .order-total-box {
  476 + padding: 30upx 0;
  477 + display: flex;
  478 + flex-direction: row;
  479 + align-items: center;
  480 + justify-content: space-between;
  481 + font-size: 26upx;
  482 + color: #333;
  483 + }
  484 +
  485 + .order-total-box .way-color {
  486 + color: #333333;
  487 + font-size: 32rpx;
  488 + }
  489 +
  490 + .order-details-information {
  491 + background: #fff;
  492 + }
  493 +
  494 + .order-details-information.padd {
  495 + padding: 30upx;
  496 + margin: 0 30upx;
  497 + box-sizing: border-box;
  498 + }
  499 +
  500 + .order-details-information .order-title {
  501 + font-size: 30upx;
  502 + color: #333;
  503 + font-weight: 500;
  504 + display: flex;
  505 + flex-direction: row;
  506 + align-items: center;
  507 + }
  508 +
  509 + .order-details-information .info-box {
  510 + margin-top: 30upx;
  511 + }
  512 +
  513 + .order-details-information .info-box .item {
  514 + display: flex;
  515 + flex-direction: row;
  516 + align-items: center;
  517 + justify-content: space-between;
  518 + font-size: 24upx;
  519 + color: #666;
  520 + margin-bottom: 20upx;
  521 + }
  522 +
  523 + .order-details-information .info-box .item .copy-color {
  524 + font-size: 24upx;
  525 + color: #C5AA7B;
  526 + }
  527 +
  528 + .order-details-btn {
  529 + position: fixed;
  530 + bottom: 0;
  531 + left: 0;
  532 + width: 100%;
  533 + min-height: 160upx;
  534 + background: #fff;
  535 + box-shadow: 0px 0px 10px 0px rgba(51, 51, 51, 0.1);
  536 + box-sizing: border-box;
  537 + display: flex;
  538 + padding: 0 30upx;
  539 + flex-direction: row;
  540 + align-items: center;
  541 + justify-content: space-between;
  542 + z-index: 10;
  543 + }
  544 +
  545 + .order-details-btn .btn {
  546 + width: 100%;
  547 + height: 100upx;
  548 + background: #333333;
  549 + font-size: 28upx;
  550 + color: #FFEBC4;
  551 + text-align: center;
  552 + line-height: 100upx;
  553 + font-weight: 500upx;
  554 + }
  555 +
  556 + .order-details-btn .btn-l {
  557 + width: 50%;
  558 + height: 100upx;
  559 + border: 2rpx solid #333333;
  560 + font-size: 28upx;
  561 + color: #333;
  562 + text-align: center;
  563 + line-height: 100upx;
  564 + box-sizing: border-box;
  565 + margin-right: 10rpx;
  566 + }
  567 +
  568 + .order-details-btn .btn-r {
  569 + width: 50%;
  570 + margin-left: 10rpx;
  571 + }
  572 +
  573 + .mt20 {
  574 + margin-top: 20upx;
  575 + }
  576 +
  577 + .order-title-box {
  578 + display: flex;
  579 + flex-direction: row;
  580 + align-items: center;
  581 + justify-content: space-between;
  582 + }
  583 +
  584 + .order-details-information .order-title-box .order-title.padd-l {
  585 + padding-left: 30upx;
  586 + }
  587 +
  588 + .arrow-down-img {
  589 + width: 40upx;
  590 + height: 40upx;
  591 + margin: 30upx;
  592 + box-sizing: border-box;
  593 + }
  594 +
  595 + .evaluate {
  596 + height: 56upx;
  597 + border-radius: 28upx;
  598 + text-align: center;
  599 + line-height: 56upx;
  600 + font-size: 26upx;
  601 + padding: 0 30upx;
  602 + border: 1px solid #C5AA7B;
  603 + color: #C5AA7B;
  604 + }
  605 +
  606 + .evaluate2 {
  607 + height: 56upx;
  608 + border-radius: 28upx;
  609 + text-align: center;
  610 + line-height: 56upx;
  611 + font-size: 26upx;
  612 + padding: 0 30upx;
  613 + border: 1px solid #BBBBBB;
  614 + color: #333;
  615 + }
  616 +
  617 + .emptyOrder-box {
  618 + padding: 70upx 0;
  619 +
  620 + .emptyOrder-img {
  621 + width: 200upx;
  622 + height: 200upx;
  623 + }
  624 + }
  625 +
  626 + .pay-type-item {
  627 + .pay-type-radio {
  628 + background-color: white;
  629 + border-bottom: 1upx solid #EDEDED;
  630 + margin-bottom: 20upx;
  631 + padding: 24upx 20upx 24upx 20upx;
  632 +
  633 + .pay-type-img {
  634 + display: inline-block;
  635 +
  636 + .pay-type-img-inner {
  637 + width: 50upx;
  638 + height: 50upx;
  639 + vertical-align: middle;
  640 + }
  641 + }
  642 +
  643 + .pay-type-label {
  644 + vertical-align: middle;
  645 + margin-left: 30upx;
  646 + }
  647 +
  648 + .pay-type-radio-item {
  649 + float: right;
  650 + margin-right: 20upx;
  651 + width: 50upx;
  652 + height: 50upx;
  653 + }
  654 + }
  655 +
  656 + .huabei-detail {
  657 + margin-top: 20upx;
  658 +
  659 + .fenqi-wenzi {
  660 + display: inline-block;
  661 + margin-left: 64upx;
  662 + }
  663 +
  664 + .fenqi-amount {
  665 + display: block;
  666 + margin-left: 64upx;
  667 + margin-top: 14upx;
  668 + color: #BABBBC;
  669 + }
  670 +
  671 + .fenqi-charge-fee {
  672 + float: right;
  673 + margin-right: 68upx;
  674 + color: #BABBBC;
  675 + }
  676 +
  677 + .fenqi-modal {
  678 + width: 40upx;
  679 + height: 40upx;
  680 + margin-left: 20upx;
  681 + float: right;
  682 + position: relative;
  683 + top: -80upx;
  684 + }
  685 + }
  686 + }
  687 +
  688 + .paytype-confirm {
  689 + height: 120upx;
  690 + padding: 0upx 108upx 0upx 32upx;
  691 +
  692 + .fenqi-all {
  693 + display: inline-block;
  694 + width: 100%;
  695 + }
  696 +
  697 + .fenqi-total-amount {
  698 + width: 65%;
  699 + float: left;
  700 + }
  701 +
  702 + .fenqi-confirm {
  703 + float: right;
  704 + width: 160upx;
  705 + padding: 0upx 20upx;
  706 +
  707 + .btn {
  708 + width: 216upx;
  709 + height: 80upx;
  710 + line-height: 80upx;
  711 + border-radius: 40upx;
  712 + font-size: 28upx;
  713 + text-align: center;
  714 + background: linear-gradient(90deg, rgba(255, 162, 0, 1), rgba(255, 121, 17, 1));
  715 + color: #fff;
  716 + display: inline-block;
  717 + margin-right: 66upx;
  718 + }
  719 + }
  720 + }
  721 +
  722 + .period-radio {
  723 + margin: 30upx;
  724 + padding-right: 100upx;
  725 + width: 95%;
  726 + border-bottom: 1px solid #EFEFEF;
  727 +
  728 + .period-amount {
  729 + display: inline-block;
  730 +
  731 + .period-each-charge {
  732 + display: inline-block;
  733 + margin-top: 12upx;
  734 + margin-left: 6upx;
  735 + font-size: 26upx;
  736 + color: #b7b7b7;
  737 + margin-bottom: 13upx;
  738 + }
  739 + }
  740 +
  741 + .period-each {
  742 + display: block;
  743 + }
  744 +
  745 + .period-type-radio-item {
  746 + float: right;
  747 + }
  748 + }
  749 +</style>
0 \ No newline at end of file 750 \ No newline at end of file
lvdao-miniapp/utils/request.js
  View file @0c19043
@@ -16,7 +16,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -16,7 +16,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
16 } 16 }
17 var bases = '' 17 var bases = ''
18 if(baseUrl == 1){ 18 if(baseUrl == 1){
19 - // bases = 'http://128.10.249.32:9003/' + url; 19 + // bases = 'http://128.10.249.22:9003' + url;
20 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url; 20 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
@@ -34,7 +34,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -34,7 +34,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
34 bases = c1 + 'cdwlMall/meserver/api' + url; 34 bases = c1 + 'cdwlMall/meserver/api' + url;
35 35
36 }else{ 36 }else{
37 - // bases = 'http://172.16.61.125:9004/' + url; 37 + // bases = 'http://128.10.249.22:9004' + url;
38 // bases = 'http://172.16.61.48/business-server' + url; 38 // bases = 'http://172.16.61.48/business-server' + url;
39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; 40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
@@ -45,7 +45,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -45,7 +45,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
45 45
46 } 46 }
47 var token = uni.getStorageSync('token') || ''; 47 var token = uni.getStorageSync('token') || '';
48 - var shopId = uni.getStorageSync('shopId') || ''; 48 + var shopId = uni.getStorageSync('shopId') || '154';
49 return new Promise(function(resolve, reject) { 49 return new Promise(function(resolve, reject) {
50 uni.showLoading({ 50 uni.showLoading({
51 title: '加载中...' 51 title: '加载中...'