Commit e4b57ea52adea1067e62a4bcfb866c27f9c4918f
'最新'
Showing
10 changed files
with
395 additions
and
279 deletions
admin-web-master/src/utils/request.js
| @@ -18,7 +18,8 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost | @@ -18,7 +18,8 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost | ||
| 18 | 18 | ||
| 19 | baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; | 19 | baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; |
| 20 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; | 20 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 21 | - // baseURL = 'http://128.10.249.22:9003'; | 21 | + |
| 22 | + // baseURL = 'http://128.10.249.26:9003'; | ||
| 22 | 23 | ||
| 23 | } else { | 24 | } else { |
| 24 | console.error('---------------------') | 25 | console.error('---------------------') |
admin-web-master/src/views/shopRental/manage/index.vue
| @@ -81,7 +81,7 @@ | @@ -81,7 +81,7 @@ | ||
| 81 | {{scope.row.contractType}} | 81 | {{scope.row.contractType}} |
| 82 | 82 | ||
| 83 | </template> | 83 | </template> |
| 84 | - </el-table-column> | 84 | + </el-table-column> |
| 85 | <el-table-column prop="dataStatus" label="合同状态"> | 85 | <el-table-column prop="dataStatus" label="合同状态"> |
| 86 | <template slot-scope="scope"> | 86 | <template slot-scope="scope"> |
| 87 | <span v-if='scope.row.dataStatus == 1'>使用中</span> | 87 | <span v-if='scope.row.dataStatus == 1'>使用中</span> |
| @@ -236,6 +236,8 @@ | @@ -236,6 +236,8 @@ | ||
| 236 | } | 236 | } |
| 237 | }, | 237 | }, |
| 238 | async OA(row){ | 238 | async OA(row){ |
| 239 | + // console.error(row) | ||
| 240 | + // return | ||
| 239 | console.log(this.$baseURL+row.appendicesContract) | 241 | console.log(this.$baseURL+row.appendicesContract) |
| 240 | const response = await axios({ | 242 | const response = await axios({ |
| 241 | method: 'get', | 243 | method: 'get', |
| @@ -256,6 +258,7 @@ | @@ -256,6 +258,7 @@ | ||
| 256 | fd.append('reviewers', '1858710592190291968'); | 258 | fd.append('reviewers', '1858710592190291968'); |
| 257 | fd.append('fileNames', '合同.docx'); | 259 | fd.append('fileNames', '合同.docx'); |
| 258 | fd.append('title', '这是一个流程'); | 260 | fd.append('title', '这是一个流程'); |
| 261 | + fd.append('contractNumber', row.contractNumber); | ||
| 259 | console.log(fd); | 262 | console.log(fd); |
| 260 | // return | 263 | // return |
| 261 | // let c1 ={ | 264 | // let c1 ={ |
| @@ -269,18 +272,18 @@ | @@ -269,18 +272,18 @@ | ||
| 269 | general(fd).then(res => { | 272 | general(fd).then(res => { |
| 270 | console.log(res); | 273 | console.log(res); |
| 271 | let data = JSON.parse(res.data) | 274 | let data = JSON.parse(res.data) |
| 272 | - if(data.code == '0'){ | 275 | + if(data.code == '200'){ |
| 273 | this.$message({ | 276 | this.$message({ |
| 274 | type: 'success', | 277 | type: 'success', |
| 275 | message: '发起成功' | 278 | message: '发起成功' |
| 276 | }) | 279 | }) |
| 277 | - edit({ | ||
| 278 | - contractNumber: row.contractNumber, | ||
| 279 | - dataStatus: '5', | ||
| 280 | - }).then(res1 => { | ||
| 281 | - console.error(res1) | ||
| 282 | - this.resetting() | ||
| 283 | - }) | 280 | + // edit({ |
| 281 | + // contractNumber: row.contractNumber, | ||
| 282 | + // dataStatus: '5', | ||
| 283 | + // }).then(res1 => { | ||
| 284 | + // console.error(res1) | ||
| 285 | + // this.resetting() | ||
| 286 | + // }) | ||
| 284 | } else { | 287 | } else { |
| 285 | this.$message({ | 288 | this.$message({ |
| 286 | type: 'error', | 289 | type: 'error', |
lvdao-miniapp/pages/business/businessDetail/businessDetail.vue
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | <view class="title">{{tableData.cereBasicInformationVenue.venueName}}</view> | 20 | <view class="title">{{tableData.cereBasicInformationVenue.venueName}}</view> |
| 21 | <view class="info-item"> | 21 | <view class="info-item"> |
| 22 | <image :src="$imgUrl('/kefu.png')"></image> | 22 | <image :src="$imgUrl('/kefu.png')"></image> |
| 23 | - <text>{{tableData.cereBasicInformationVenue.detailedLocation}}</text> | 23 | + <!-- <text>{{tableData.cereBasicInformationVenue.detailedLocation}}</text> --> |
| 24 | </view> | 24 | </view> |
| 25 | </view> | 25 | </view> |
| 26 | </view> | 26 | </view> |
| @@ -53,8 +53,10 @@ export default { | @@ -53,8 +53,10 @@ export default { | ||
| 53 | }; | 53 | }; |
| 54 | }, | 54 | }, |
| 55 | onLoad(option){ | 55 | onLoad(option){ |
| 56 | + | ||
| 56 | this.imgurl = this.$img | 57 | this.imgurl = this.$img |
| 57 | - this.tableData = JSON.parse(option.item) | 58 | + let ce = decodeURIComponent(option.item) |
| 59 | + this.tableData = JSON.parse(ce) | ||
| 58 | if (typeof this.tableData.previousEvents === 'string') { | 60 | if (typeof this.tableData.previousEvents === 'string') { |
| 59 | this.tableData.previousEvents = this.tableData.previousEvents.split(','); | 61 | this.tableData.previousEvents = this.tableData.previousEvents.split(','); |
| 60 | } | 62 | } |
lvdao-miniapp/pages/business/businessList/businessList.vue
| @@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
| 105 | toDetail(items) { | 105 | toDetail(items) { |
| 106 | let msg = JSON.stringify(items) | 106 | let msg = JSON.stringify(items) |
| 107 | uni.navigateTo({ | 107 | uni.navigateTo({ |
| 108 | - url: `/pages/business/businessDetail/businessDetail?item=${msg}` | 108 | + url: `/pages/business/businessDetail/businessDetail?item=${encodeURIComponent(msg)}` |
| 109 | }) | 109 | }) |
| 110 | 110 | ||
| 111 | }, | 111 | }, |
lvdao-miniapp/pages/home/home.vue
| @@ -589,7 +589,7 @@ | @@ -589,7 +589,7 @@ | ||
| 589 | toDetailTwo(item, path) { | 589 | toDetailTwo(item, path) { |
| 590 | let items = JSON.stringify(item) | 590 | let items = JSON.stringify(item) |
| 591 | uni.navigateTo({ | 591 | uni.navigateTo({ |
| 592 | - url: `${path}?item=${items}` | 592 | + url: `${path}?item=${encodeURIComponent(items)}` |
| 593 | }) | 593 | }) |
| 594 | }, | 594 | }, |
| 595 | goDetail(path) { | 595 | goDetail(path) { |
lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue
| @@ -19,14 +19,14 @@ | @@ -19,14 +19,14 @@ | ||
| 19 | <view class="info-item">起止时间:{{tableData.startTime}}至{{tableData.endTime}}</view> | 19 | <view class="info-item">起止时间:{{tableData.startTime}}至{{tableData.endTime}}</view> |
| 20 | <view class="info-item">联系人:{{tableData.contactPerson}}</view> | 20 | <view class="info-item">联系人:{{tableData.contactPerson}}</view> |
| 21 | <view class="info-item">联系电话:{{tableData.contactPhone}}</view> | 21 | <view class="info-item">联系电话:{{tableData.contactPhone}}</view> |
| 22 | - <view class="info-item">已参与报名人数:<span>{{tableData.registeredCount}}</span>人</view> | 22 | + <view class="info-item">已参与报名人数:<span>{{tableData.registeredCount || 0}}</span>人</view> |
| 23 | </view> | 23 | </view> |
| 24 | </view> | 24 | </view> |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | <!-- 底部 --> | 27 | <!-- 底部 --> |
| 28 | <view style="height: 125rpx;"></view> | 28 | <view style="height: 125rpx;"></view> |
| 29 | - <view class="page-footer" v-if="tableData.activeState == 1"> | 29 | + <view class="page-footer" v-if="tableData.reviewStatus == 2"> |
| 30 | <!-- <view class="footer-service"> | 30 | <!-- <view class="footer-service"> |
| 31 | <u-image :showLoading="true" :src="$imgUrl('/sevice-icon.png')" width="30rpx" height="30rpx"></u-image> | 31 | <u-image :showLoading="true" :src="$imgUrl('/sevice-icon.png')" width="30rpx" height="30rpx"></u-image> |
| 32 | <text>客服</text> | 32 | <text>客服</text> |
lvdao-miniapp/pages/my/my.vue
| @@ -185,7 +185,7 @@ | @@ -185,7 +185,7 @@ | ||
| 185 | <image :src="$imgUrl('/right2.png')"></image> | 185 | <image :src="$imgUrl('/right2.png')"></image> |
| 186 | </view> | 186 | </view> |
| 187 | </view> | 187 | </view> |
| 188 | - <view class="list" @click="toPage('/pages/serve/serve')"> | 188 | +<!-- <view class="list" @click="toPage('/pages/serve/serve')"> |
| 189 | <view class="icon-data"> | 189 | <view class="icon-data"> |
| 190 | <view class="icon"> | 190 | <view class="icon"> |
| 191 | <image src="@/static/icon/icon4.png"mode="heightFix"></image> | 191 | <image src="@/static/icon/icon4.png"mode="heightFix"></image> |
| @@ -199,7 +199,7 @@ | @@ -199,7 +199,7 @@ | ||
| 199 | <view class="more"> | 199 | <view class="more"> |
| 200 | <image :src="$imgUrl('/right2.png')"></image> | 200 | <image :src="$imgUrl('/right2.png')"></image> |
| 201 | </view> | 201 | </view> |
| 202 | - </view> | 202 | + </view> --> |
| 203 | <view class="list" @click="repair"> | 203 | <view class="list" @click="repair"> |
| 204 | <view class="icon-data"> | 204 | <view class="icon-data"> |
| 205 | <view class="icon"> | 205 | <view class="icon"> |
lvdao-miniapp/pages/orderList/orderList - 副本.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <view class="page"> | ||
| 3 | + <view class="screen-list"> | ||
| 4 | + <view class="list" @click="show = true"> | ||
| 5 | + <text>日期:{{dataTime}}</text> | ||
| 6 | + <image :src="$imgUrl('/down.png')"></image> | ||
| 7 | + </view> | ||
| 8 | + <view class="list"> | ||
| 9 | + <u-button type="info" style="height:26px;font-size:14px;" @click="close">重置</u-button> | ||
| 10 | + </view> | ||
| 11 | + | ||
| 12 | + </view> | ||
| 13 | + <u-collapse-item :title="`订单${item.orderId}`" v-for="(item, index) in list" :key="index"> | ||
| 14 | + <view style="display: flex;justify-content: space-between;"> | ||
| 15 | + <view>下单账号</view> | ||
| 16 | + <view>{{item.customerName}}</view> | ||
| 17 | + </view> | ||
| 18 | + <view style="display: flex;justify-content: space-between;"> | ||
| 19 | + <view>支付单号</view> | ||
| 20 | + <view>{{item.transactionId}}</view> | ||
| 21 | + </view> | ||
| 22 | + <view style="display: flex;justify-content: space-between;"> | ||
| 23 | + <view>支付时间</view> | ||
| 24 | + <view>{{item.paymentTime}}</view> | ||
| 25 | + </view> | ||
| 26 | + <view style="display: flex;justify-content: space-between;"> | ||
| 27 | + <view>商品名称</view> | ||
| 28 | + <view>{{item.products[0].productName}}</view> | ||
| 29 | + </view> | ||
| 30 | + <view style="display: flex;justify-content: space-between;"> | ||
| 31 | + <view>支付金额</view> | ||
| 32 | + <view>{{item.price}}</view> | ||
| 33 | + </view> | ||
| 34 | + <view style="display: flex;justify-content: space-between;"> | ||
| 35 | + <view>订单状态</view> | ||
| 36 | + <view> | ||
| 37 | + <span v-if="item.state == 1">待付款</span> | ||
| 38 | + <span v-if="item.state == 2">待发货</span> | ||
| 39 | + <span v-if="item.state == 3">已发货</span> | ||
| 40 | + <span v-if="item.state == 4">已完成</span> | ||
| 41 | + <span v-if="item.state == 5">已关闭</span> | ||
| 42 | + <span v-if="item.state == 6">待成团</span> | ||
| 43 | + <span v-if="item.state == 7">待售后</span> | ||
| 44 | + <span v-if="item.state == 8">已退款</span> | ||
| 45 | + </view> | ||
| 46 | + </view> | ||
| 47 | + </u-collapse-item> | ||
| 48 | + <u-calendar v-model="show" mode="range" @change="change" @close="handleClose" active-bg-color="#19be6b" active-color="#fff" range-bg-color="#19be6b" range-color="#fff" btn-type="success"></u-calendar> | ||
| 49 | + | ||
| 50 | + </view> | ||
| 51 | +</template> | ||
| 52 | + | ||
| 53 | +<script> | ||
| 54 | + export default { | ||
| 55 | + data() { | ||
| 56 | + return { | ||
| 57 | + show: false, | ||
| 58 | + list: [], | ||
| 59 | + pageindex: { | ||
| 60 | + afterState: "", | ||
| 61 | + dates: [], | ||
| 62 | + page: 1, | ||
| 63 | + pageSize: 10, | ||
| 64 | + search: "", | ||
| 65 | + searchType: "1", | ||
| 66 | + state: "" | ||
| 67 | + }, | ||
| 68 | + dataTime:'' | ||
| 69 | + }; | ||
| 70 | + }, | ||
| 71 | + mounted() { | ||
| 72 | + this.getALL() | ||
| 73 | + }, | ||
| 74 | + onLoad(optiong) { | ||
| 75 | + | ||
| 76 | + }, | ||
| 77 | + methods: { | ||
| 78 | + change(e){ | ||
| 79 | + console.log(e) | ||
| 80 | + this.dataTime = `${e.startDate}-${e.endDate}` | ||
| 81 | + this.getALL() | ||
| 82 | + }, | ||
| 83 | + close(){ | ||
| 84 | + this.dataTime = '' | ||
| 85 | + this.getALL() | ||
| 86 | + }, | ||
| 87 | + getALL() { | ||
| 88 | + // this.$http.sendRequest('/order/getAll', 'POST', this.pageindex, 2).then(res => { | ||
| 89 | + // //成功回调 | ||
| 90 | + // this.list = res.data.data.list | ||
| 91 | + // }) | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + } | ||
| 95 | + } | ||
| 96 | +</script> | ||
| 97 | + | ||
| 98 | +<style scoped lang="scss"> | ||
| 99 | + // @import 'application.scss'; | ||
| 100 | + .page { | ||
| 101 | + background-color: #fff; | ||
| 102 | + padding: 20px; | ||
| 103 | + } | ||
| 104 | + | ||
| 105 | + .juli { | ||
| 106 | + padding: 10rpx; | ||
| 107 | + display: flex; | ||
| 108 | + flex-wrap: wrap; | ||
| 109 | + | ||
| 110 | + .u-transition { | ||
| 111 | + // width: 31%; | ||
| 112 | + margin: 1%; | ||
| 113 | + // width: 212rpx; | ||
| 114 | + // height: 80rpx; | ||
| 115 | + border-radius: 16rpx 16rpx 16rpx 16rpx; | ||
| 116 | + background-color: rgba(21, 98, 214, 0.1); | ||
| 117 | + // line-height: 80rpx; | ||
| 118 | + text-align: center; | ||
| 119 | + font-style: normal; | ||
| 120 | + color: #1562D6; | ||
| 121 | + font-size: 28rpx; | ||
| 122 | + border-radius: 2px; | ||
| 123 | + | ||
| 124 | + } | ||
| 125 | + | ||
| 126 | + ::v-deep .u-tag--primary--plain { | ||
| 127 | + border: 0px; | ||
| 128 | + border-radius: 2px; | ||
| 129 | + background-color: #ebebeb; | ||
| 130 | + | ||
| 131 | + .u-tag__text--primary--plain { | ||
| 132 | + color: #000; | ||
| 133 | + | ||
| 134 | + } | ||
| 135 | + } | ||
| 136 | + | ||
| 137 | + ::v-deep .u-tag--primary { | ||
| 138 | + background-color: rgba(245, 178, 160, 0.3); | ||
| 139 | + border: 0px; | ||
| 140 | + border-radius: 2px; | ||
| 141 | + | ||
| 142 | + .u-tag__text--primary { | ||
| 143 | + color: #ff3442; | ||
| 144 | + } | ||
| 145 | + } | ||
| 146 | + | ||
| 147 | + .jinbutiao { | ||
| 148 | + display: flex; | ||
| 149 | + width: 100%; | ||
| 150 | + align-items: center; | ||
| 151 | + | ||
| 152 | + .u-slider { | ||
| 153 | + width: 80%; | ||
| 154 | + margin-right: 20rpx; | ||
| 155 | + } | ||
| 156 | + } | ||
| 157 | + } | ||
| 158 | + | ||
| 159 | + .choose1 { | ||
| 160 | + width: 100%; | ||
| 161 | + display: flex; | ||
| 162 | + | ||
| 163 | + .choose1left { | ||
| 164 | + width: 26%; | ||
| 165 | + border-right: 2rpx solid #f6f6f6; | ||
| 166 | + | ||
| 167 | + .leftItem1 { | ||
| 168 | + width: 100%; | ||
| 169 | + display: flex; | ||
| 170 | + justify-content: center; | ||
| 171 | + align-items: center; | ||
| 172 | + padding: 20rpx 0; | ||
| 173 | + } | ||
| 174 | + } | ||
| 175 | + | ||
| 176 | + .choose1right { | ||
| 177 | + flex: 1; | ||
| 178 | + | ||
| 179 | + // width: 70%; | ||
| 180 | + .rightBox { | ||
| 181 | + width: 90%; | ||
| 182 | + margin: 0 auto; | ||
| 183 | + | ||
| 184 | + .weizhiName { | ||
| 185 | + display: flex; | ||
| 186 | + justify-content: space-between; | ||
| 187 | + align-items: center; | ||
| 188 | + | ||
| 189 | + // height: 80rpx; | ||
| 190 | + .weizhiLeft { | ||
| 191 | + display: flex; | ||
| 192 | + align-items: center; | ||
| 193 | + | ||
| 194 | + .weizhiInput { | ||
| 195 | + color: #959595; | ||
| 196 | + } | ||
| 197 | + } | ||
| 198 | + | ||
| 199 | + .weizhiSpan { | ||
| 200 | + color: #D32D25; | ||
| 201 | + } | ||
| 202 | + } | ||
| 203 | + | ||
| 204 | + .juli { | ||
| 205 | + display: flex; | ||
| 206 | + justify-content: space-between; | ||
| 207 | + align-items: center; | ||
| 208 | + flex-wrap: wrap; | ||
| 209 | + | ||
| 210 | + .u-transition { | ||
| 211 | + // width: 31%; | ||
| 212 | + margin: 1%; | ||
| 213 | + // width: 212rpx; | ||
| 214 | + // height: 80rpx; | ||
| 215 | + border-radius: 16rpx 16rpx 16rpx 16rpx; | ||
| 216 | + background-color: rgba(21, 98, 214, 0.1); | ||
| 217 | + // line-height: 80rpx; | ||
| 218 | + text-align: center; | ||
| 219 | + font-style: normal; | ||
| 220 | + color: #1562D6; | ||
| 221 | + font-size: 28rpx; | ||
| 222 | + | ||
| 223 | + } | ||
| 224 | + | ||
| 225 | + .u-tag-wrapper { | ||
| 226 | + width: 100%; | ||
| 227 | + height: 100%; | ||
| 228 | + border: none !important; | ||
| 229 | + } | ||
| 230 | + | ||
| 231 | + .u-tag { | ||
| 232 | + padding: 0; | ||
| 233 | + width: 212rpx !important; | ||
| 234 | + height: 60rpx !important; | ||
| 235 | + } | ||
| 236 | + | ||
| 237 | + .u-tag__text { | ||
| 238 | + width: 100%; | ||
| 239 | + font-size: 25rpx; | ||
| 240 | + text-align: center; | ||
| 241 | + margin: 0 auto; | ||
| 242 | + } | ||
| 243 | + | ||
| 244 | + } | ||
| 245 | + } | ||
| 246 | + | ||
| 247 | + .quyu { | ||
| 248 | + display: flex; | ||
| 249 | + padding-left: 20rpx; | ||
| 250 | + height: 300px; | ||
| 251 | + width: 100%; | ||
| 252 | + | ||
| 253 | + .sl_city { | ||
| 254 | + width: 48%; | ||
| 255 | + margin-right: 0px; | ||
| 256 | + overflow: auto; | ||
| 257 | + | ||
| 258 | + } | ||
| 259 | + } | ||
| 260 | + } | ||
| 261 | + } | ||
| 262 | + | ||
| 263 | + ::v-deep .u-input__input { | ||
| 264 | + text-align: right; | ||
| 265 | + } | ||
| 266 | + .screen-list { | ||
| 267 | + display: flex; | ||
| 268 | + align-items: center; | ||
| 269 | + justify-content: space-between; | ||
| 270 | + width: 100%; | ||
| 271 | + .zidong{ | ||
| 272 | + width: 160rpx; | ||
| 273 | + background-color: #19be6b; | ||
| 274 | + color: #fff; | ||
| 275 | + padding: 10rpx; | ||
| 276 | + border-radius: 30rpx; | ||
| 277 | + font-size: 24rpx; | ||
| 278 | + text-align: center; | ||
| 279 | + } | ||
| 280 | + .list { | ||
| 281 | + display: flex; | ||
| 282 | + justify-content: center; | ||
| 283 | + align-items: center; | ||
| 284 | + height: 100%; | ||
| 285 | + text { | ||
| 286 | + font-size: 26rpx; | ||
| 287 | + color: #555555; | ||
| 288 | + } | ||
| 289 | + image { | ||
| 290 | + width: 30rpx; | ||
| 291 | + height: 30rpx; | ||
| 292 | + margin-left: 10rpx; | ||
| 293 | + } | ||
| 294 | + } | ||
| 295 | + .action { | ||
| 296 | + text { | ||
| 297 | + color: $base; | ||
| 298 | + } | ||
| 299 | + } | ||
| 300 | + } | ||
| 301 | + | ||
| 302 | +</style> | ||
| 0 | \ No newline at end of file | 303 | \ No newline at end of file |
lvdao-miniapp/pages/orderList/orderList.vue
| 1 | <template> | 1 | <template> |
| 2 | <view class="page"> | 2 | <view class="page"> |
| 3 | - <view class="screen-list"> | ||
| 4 | - <view class="list" @click="show = true"> | ||
| 5 | - <text>日期:{{dataTime}}</text> | ||
| 6 | - <image :src="$imgUrl('/down.png')"></image> | ||
| 7 | - </view> | ||
| 8 | - <view class="list"> | ||
| 9 | - <u-button type="info" style="height:26px;font-size:14px;" @click="close">重置</u-button> | ||
| 10 | - </view> | ||
| 11 | - | ||
| 12 | - </view> | ||
| 13 | - <u-collapse-item :title="`订单${item.orderId}`" v-for="(item, index) in list" :key="index"> | ||
| 14 | - <view style="display: flex;justify-content: space-between;"> | ||
| 15 | - <view>下单账号</view> | ||
| 16 | - <view>{{item.customerName}}</view> | ||
| 17 | - </view> | ||
| 18 | - <view style="display: flex;justify-content: space-between;"> | ||
| 19 | - <view>支付单号</view> | ||
| 20 | - <view>{{item.transactionId}}</view> | ||
| 21 | - </view> | ||
| 22 | - <view style="display: flex;justify-content: space-between;"> | ||
| 23 | - <view>支付时间</view> | ||
| 24 | - <view>{{item.paymentTime}}</view> | ||
| 25 | - </view> | ||
| 26 | - <view style="display: flex;justify-content: space-between;"> | ||
| 27 | - <view>商品名称</view> | ||
| 28 | - <view>{{item.products[0].productName}}</view> | ||
| 29 | - </view> | ||
| 30 | - <view style="display: flex;justify-content: space-between;"> | ||
| 31 | - <view>支付金额</view> | ||
| 32 | - <view>{{item.price}}</view> | ||
| 33 | - </view> | ||
| 34 | - <view style="display: flex;justify-content: space-between;"> | ||
| 35 | - <view>订单状态</view> | ||
| 36 | - <view> | ||
| 37 | - <span v-if="item.state == 1">待付款</span> | ||
| 38 | - <span v-if="item.state == 2">待发货</span> | ||
| 39 | - <span v-if="item.state == 3">已发货</span> | ||
| 40 | - <span v-if="item.state == 4">已完成</span> | ||
| 41 | - <span v-if="item.state == 5">已关闭</span> | ||
| 42 | - <span v-if="item.state == 6">待成团</span> | ||
| 43 | - <span v-if="item.state == 7">待售后</span> | ||
| 44 | - <span v-if="item.state == 8">已退款</span> | 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 10" | ||
| 6 | + style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;"> | ||
| 7 | + <view style="display: flex;align-items: center;justify-content: space-between;"> | ||
| 8 | + <view style="display: flex;align-items: center;"> | ||
| 9 | + <view class="t1" style="margin-right: 15rpx;">订单号:131313</view> | ||
| 10 | + <u-icon name="arrow-right" color="#979797" size="24"></u-icon> | ||
| 11 | + </view> | ||
| 12 | + <view class="t1">待付款</view> | ||
| 13 | + </view> | ||
| 14 | + <view style="display: flex;justify-content: space-between;align-items: center;margin: 10rpx 0;"> | ||
| 15 | + <view style="display: flex;"> | ||
| 16 | + <view> | ||
| 17 | + <image style="width: 200rpx;height: 200rpx;border-radius: 18rpx;" mode="aspectFill" | ||
| 18 | + src="../../static/icon/bg1.png"></image> | ||
| 19 | + </view> | ||
| 20 | + <view | ||
| 21 | + style="display: flex;flex-direction: column;justify-content: space-around;margin-left: 15rpx;"> | ||
| 22 | + <view>产品名称</view> | ||
| 23 | + <view class="t1">下单时间:11312</view> | ||
| 24 | + </view> | ||
| 25 | + </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> | ||
| 29 | + </view> | ||
| 30 | + </view> | ||
| 31 | + <view | ||
| 32 | + style="display: flex;justify-content: space-between;padding-top: 30rpx;border-top: 2rpx solid #eee;align-items: center;"> | ||
| 33 | + <view> | ||
| 34 | + <text>共1件商品,合计 </text> | ||
| 35 | + <text style="color: red;font-weight: bold;">¥49</text> | ||
| 36 | + </view> | ||
| 37 | + <view | ||
| 38 | + style="background: #26c570;color: #fff;border-radius: 36rpx;font-size: 20rpx;padding: 14rpx 20rpx;"> | ||
| 39 | + 查看详情</view> | ||
| 45 | </view> | 40 | </view> |
| 46 | </view> | 41 | </view> |
| 47 | - </u-collapse-item> | ||
| 48 | - <u-calendar v-model="show" mode="range" @change="change" @close="handleClose" active-bg-color="#19be6b" active-color="#fff" range-bg-color="#19be6b" range-color="#fff" btn-type="success"></u-calendar> | ||
| 49 | - | 42 | + </view> |
| 50 | </view> | 43 | </view> |
| 51 | </template> | 44 | </template> |
| 52 | 45 | ||
| @@ -54,18 +47,32 @@ | @@ -54,18 +47,32 @@ | ||
| 54 | export default { | 47 | export default { |
| 55 | data() { | 48 | data() { |
| 56 | return { | 49 | return { |
| 57 | - show: false, | ||
| 58 | - list: [], | 50 | + list: [ |
| 51 | + { | ||
| 52 | + name: '全部' | ||
| 53 | + }, | ||
| 54 | + { | ||
| 55 | + name: '待付款' | ||
| 56 | + }, | ||
| 57 | + { | ||
| 58 | + name: '待发货', | ||
| 59 | + }, | ||
| 60 | + { | ||
| 61 | + name: '已发货', | ||
| 62 | + }, | ||
| 63 | + { | ||
| 64 | + name: '已完成', | ||
| 65 | + }, | ||
| 66 | + { | ||
| 67 | + name: '已关闭', | ||
| 68 | + }, | ||
| 69 | + ], | ||
| 70 | + current: 0, | ||
| 71 | + | ||
| 59 | pageindex: { | 72 | pageindex: { |
| 60 | - afterState: "", | ||
| 61 | - dates: [], | ||
| 62 | page: 1, | 73 | page: 1, |
| 63 | pageSize: 10, | 74 | pageSize: 10, |
| 64 | - search: "", | ||
| 65 | - searchType: "1", | ||
| 66 | - state: "" | ||
| 67 | }, | 75 | }, |
| 68 | - dataTime:'' | ||
| 69 | }; | 76 | }; |
| 70 | }, | 77 | }, |
| 71 | mounted() { | 78 | mounted() { |
| @@ -75,20 +82,14 @@ | @@ -75,20 +82,14 @@ | ||
| 75 | 82 | ||
| 76 | }, | 83 | }, |
| 77 | methods: { | 84 | methods: { |
| 78 | - change(e){ | ||
| 79 | - console.log(e) | ||
| 80 | - this.dataTime = `${e.startDate}-${e.endDate}` | ||
| 81 | - this.getALL() | ||
| 82 | - }, | ||
| 83 | - close(){ | ||
| 84 | - this.dataTime = '' | ||
| 85 | - this.getALL() | ||
| 86 | - }, | ||
| 87 | getALL() { | 85 | getALL() { |
| 88 | // this.$http.sendRequest('/order/getAll', 'POST', this.pageindex, 2).then(res => { | 86 | // this.$http.sendRequest('/order/getAll', 'POST', this.pageindex, 2).then(res => { |
| 89 | // //成功回调 | 87 | // //成功回调 |
| 90 | // this.list = res.data.data.list | 88 | // this.list = res.data.data.list |
| 91 | // }) | 89 | // }) |
| 90 | + }, | ||
| 91 | + change(index) { | ||
| 92 | + this.current = index; | ||
| 92 | } | 93 | } |
| 93 | 94 | ||
| 94 | } | 95 | } |
| @@ -96,207 +97,12 @@ | @@ -96,207 +97,12 @@ | ||
| 96 | </script> | 97 | </script> |
| 97 | 98 | ||
| 98 | <style scoped lang="scss"> | 99 | <style scoped lang="scss"> |
| 99 | - // @import 'application.scss'; | ||
| 100 | .page { | 100 | .page { |
| 101 | - background-color: #fff; | ||
| 102 | - padding: 20px; | ||
| 103 | - } | ||
| 104 | - | ||
| 105 | - .juli { | ||
| 106 | - padding: 10rpx; | ||
| 107 | - display: flex; | ||
| 108 | - flex-wrap: wrap; | ||
| 109 | - | ||
| 110 | - .u-transition { | ||
| 111 | - // width: 31%; | ||
| 112 | - margin: 1%; | ||
| 113 | - // width: 212rpx; | ||
| 114 | - // height: 80rpx; | ||
| 115 | - border-radius: 16rpx 16rpx 16rpx 16rpx; | ||
| 116 | - background-color: rgba(21, 98, 214, 0.1); | ||
| 117 | - // line-height: 80rpx; | ||
| 118 | - text-align: center; | ||
| 119 | - font-style: normal; | ||
| 120 | - color: #1562D6; | ||
| 121 | - font-size: 28rpx; | ||
| 122 | - border-radius: 2px; | ||
| 123 | - | ||
| 124 | - } | ||
| 125 | - | ||
| 126 | - ::v-deep .u-tag--primary--plain { | ||
| 127 | - border: 0px; | ||
| 128 | - border-radius: 2px; | ||
| 129 | - background-color: #ebebeb; | ||
| 130 | - | ||
| 131 | - .u-tag__text--primary--plain { | ||
| 132 | - color: #000; | ||
| 133 | - | ||
| 134 | - } | ||
| 135 | - } | ||
| 136 | - | ||
| 137 | - ::v-deep .u-tag--primary { | ||
| 138 | - background-color: rgba(245, 178, 160, 0.3); | ||
| 139 | - border: 0px; | ||
| 140 | - border-radius: 2px; | ||
| 141 | - | ||
| 142 | - .u-tag__text--primary { | ||
| 143 | - color: #ff3442; | ||
| 144 | - } | ||
| 145 | - } | ||
| 146 | - | ||
| 147 | - .jinbutiao { | ||
| 148 | - display: flex; | ||
| 149 | - width: 100%; | ||
| 150 | - align-items: center; | ||
| 151 | - | ||
| 152 | - .u-slider { | ||
| 153 | - width: 80%; | ||
| 154 | - margin-right: 20rpx; | ||
| 155 | - } | ||
| 156 | - } | ||
| 157 | - } | ||
| 158 | - | ||
| 159 | - .choose1 { | ||
| 160 | - width: 100%; | ||
| 161 | - display: flex; | ||
| 162 | - | ||
| 163 | - .choose1left { | ||
| 164 | - width: 26%; | ||
| 165 | - border-right: 2rpx solid #f6f6f6; | ||
| 166 | - | ||
| 167 | - .leftItem1 { | ||
| 168 | - width: 100%; | ||
| 169 | - display: flex; | ||
| 170 | - justify-content: center; | ||
| 171 | - align-items: center; | ||
| 172 | - padding: 20rpx 0; | ||
| 173 | - } | ||
| 174 | - } | ||
| 175 | - | ||
| 176 | - .choose1right { | ||
| 177 | - flex: 1; | ||
| 178 | - | ||
| 179 | - // width: 70%; | ||
| 180 | - .rightBox { | ||
| 181 | - width: 90%; | ||
| 182 | - margin: 0 auto; | ||
| 183 | - | ||
| 184 | - .weizhiName { | ||
| 185 | - display: flex; | ||
| 186 | - justify-content: space-between; | ||
| 187 | - align-items: center; | ||
| 188 | - | ||
| 189 | - // height: 80rpx; | ||
| 190 | - .weizhiLeft { | ||
| 191 | - display: flex; | ||
| 192 | - align-items: center; | ||
| 193 | - | ||
| 194 | - .weizhiInput { | ||
| 195 | - color: #959595; | ||
| 196 | - } | ||
| 197 | - } | ||
| 198 | - | ||
| 199 | - .weizhiSpan { | ||
| 200 | - color: #D32D25; | ||
| 201 | - } | ||
| 202 | - } | ||
| 203 | - | ||
| 204 | - .juli { | ||
| 205 | - display: flex; | ||
| 206 | - justify-content: space-between; | ||
| 207 | - align-items: center; | ||
| 208 | - flex-wrap: wrap; | ||
| 209 | - | ||
| 210 | - .u-transition { | ||
| 211 | - // width: 31%; | ||
| 212 | - margin: 1%; | ||
| 213 | - // width: 212rpx; | ||
| 214 | - // height: 80rpx; | ||
| 215 | - border-radius: 16rpx 16rpx 16rpx 16rpx; | ||
| 216 | - background-color: rgba(21, 98, 214, 0.1); | ||
| 217 | - // line-height: 80rpx; | ||
| 218 | - text-align: center; | ||
| 219 | - font-style: normal; | ||
| 220 | - color: #1562D6; | ||
| 221 | - font-size: 28rpx; | ||
| 222 | - | ||
| 223 | - } | ||
| 224 | - | ||
| 225 | - .u-tag-wrapper { | ||
| 226 | - width: 100%; | ||
| 227 | - height: 100%; | ||
| 228 | - border: none !important; | ||
| 229 | - } | ||
| 230 | - | ||
| 231 | - .u-tag { | ||
| 232 | - padding: 0; | ||
| 233 | - width: 212rpx !important; | ||
| 234 | - height: 60rpx !important; | ||
| 235 | - } | ||
| 236 | - | ||
| 237 | - .u-tag__text { | ||
| 238 | - width: 100%; | ||
| 239 | - font-size: 25rpx; | ||
| 240 | - text-align: center; | ||
| 241 | - margin: 0 auto; | ||
| 242 | - } | ||
| 243 | - | ||
| 244 | - } | ||
| 245 | - } | ||
| 246 | - | ||
| 247 | - .quyu { | ||
| 248 | - display: flex; | ||
| 249 | - padding-left: 20rpx; | ||
| 250 | - height: 300px; | ||
| 251 | - width: 100%; | ||
| 252 | - | ||
| 253 | - .sl_city { | ||
| 254 | - width: 48%; | ||
| 255 | - margin-right: 0px; | ||
| 256 | - overflow: auto; | ||
| 257 | - | ||
| 258 | - } | ||
| 259 | - } | ||
| 260 | - } | 101 | + |
| 261 | } | 102 | } |
| 262 | 103 | ||
| 263 | - ::v-deep .u-input__input { | ||
| 264 | - text-align: right; | 104 | + .t1 { |
| 105 | + font-size: 26rpx; | ||
| 106 | + color: #979797; | ||
| 265 | } | 107 | } |
| 266 | - .screen-list { | ||
| 267 | - display: flex; | ||
| 268 | - align-items: center; | ||
| 269 | - justify-content: space-between; | ||
| 270 | - width: 100%; | ||
| 271 | - .zidong{ | ||
| 272 | - width: 160rpx; | ||
| 273 | - background-color: #19be6b; | ||
| 274 | - color: #fff; | ||
| 275 | - padding: 10rpx; | ||
| 276 | - border-radius: 30rpx; | ||
| 277 | - font-size: 24rpx; | ||
| 278 | - text-align: center; | ||
| 279 | - } | ||
| 280 | - .list { | ||
| 281 | - display: flex; | ||
| 282 | - justify-content: center; | ||
| 283 | - align-items: center; | ||
| 284 | - height: 100%; | ||
| 285 | - text { | ||
| 286 | - font-size: 26rpx; | ||
| 287 | - color: #555555; | ||
| 288 | - } | ||
| 289 | - image { | ||
| 290 | - width: 30rpx; | ||
| 291 | - height: 30rpx; | ||
| 292 | - margin-left: 10rpx; | ||
| 293 | - } | ||
| 294 | - } | ||
| 295 | - .action { | ||
| 296 | - text { | ||
| 297 | - color: $base; | ||
| 298 | - } | ||
| 299 | - } | ||
| 300 | - } | ||
| 301 | - | ||
| 302 | </style> | 108 | </style> |
| 303 | \ No newline at end of file | 109 | \ No newline at end of file |
lvdao-miniapp/pages/workbench/workbench.vue
| @@ -98,6 +98,7 @@ | @@ -98,6 +98,7 @@ | ||
| 98 | </view> | 98 | </view> |
| 99 | </view> | 99 | </view> |
| 100 | </view> | 100 | </view> |
| 101 | + | ||
| 101 | <view class="main"> | 102 | <view class="main"> |
| 102 | <view class="bg-white" v-for="item in pageList5" :key="item.id"> | 103 | <view class="bg-white" v-for="item in pageList5" :key="item.id"> |
| 103 | <view class="bidding-title"> | 104 | <view class="bidding-title"> |
| @@ -115,6 +116,7 @@ | @@ -115,6 +116,7 @@ | ||
| 115 | </view> | 116 | </view> |
| 116 | </view> | 117 | </view> |
| 117 | </view> | 118 | </view> |
| 119 | + <!-- <view style="height: 100rpx;"></view> --> | ||
| 118 | <!-- tabbar --> | 120 | <!-- tabbar --> |
| 119 | <tabbar :tabBarShow="1"></tabbar> | 121 | <tabbar :tabBarShow="1"></tabbar> |
| 120 | </view> | 122 | </view> |