Commit 29cad55aa228bda55ddd3c37ffce95783db7fcaa
1 parent
b70113e1
'验收'
Showing
39 changed files
with
2032 additions
and
1010 deletions
merchant-web-master/src/utils/request.js
| @@ -20,8 +20,8 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173') { | @@ -20,8 +20,8 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173') { | ||
| 20 | }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){ | 20 | }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){ |
| 21 | // 其他情况的默认值 | 21 | // 其他情况的默认值 |
| 22 | // PREFIX = 'http://8.130.38.56:8027/business-server'; | 22 | // PREFIX = 'http://8.130.38.56:8027/business-server'; |
| 23 | - PREFIX = 'https://jy.scjysm.asia:18086/merchant-business'; | ||
| 24 | - // PREFIX = 'http://192.168.2.193:9004'; | 23 | + // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business'; |
| 24 | + PREFIX = 'http://192.168.2.193:9004'; | ||
| 25 | }else{ | 25 | }else{ |
| 26 | // PREFIX = '/merchant-business'; | 26 | // PREFIX = '/merchant-business'; |
| 27 | // PREFIX = 'http://8.130.38.56:9004'; | 27 | // PREFIX = 'http://8.130.38.56:9004'; |
merchant-web-master/src/views/comprehensive/OrderRhq/pendDetails.vue renamed to merchant-web-master/src/views/comprehensive/OrderRhq/afterDetails.vue
| 1 | <template> | 1 | <template> |
| 2 | - <div class="order_details"> | ||
| 3 | - <div class="cotent"> | ||
| 4 | - <div class="left_part"> | ||
| 5 | - <div class="order_info"> | ||
| 6 | - <h2>订单信息</h2> | ||
| 7 | - <ul> | ||
| 8 | - <li> | ||
| 9 | - <p> | ||
| 10 | - <span>商家名称:</span> | ||
| 11 | - <span>{{ order.shopName }}</span> | ||
| 12 | - </p> | ||
| 13 | - <p> | ||
| 14 | - <span>订单ID:</span> | ||
| 15 | - <span>{{ order.orderId }}</span> | ||
| 16 | - </p> | ||
| 17 | - <p> | ||
| 18 | - <span>支付单号:</span> | ||
| 19 | - <span>{{ order.transactionId }}</span> | ||
| 20 | - </p> | ||
| 21 | - </li> | ||
| 22 | - <li> | ||
| 23 | - <p> | ||
| 24 | - <span>订单状态:</span> | ||
| 25 | - <span v-if="order.state === 1">待付款</span> | ||
| 26 | - <span v-if="order.state === 2">待发货</span> | ||
| 27 | - <span v-if="order.state === 3">待收货</span> | ||
| 28 | - <span v-if="order.state === 4">已完成</span> | ||
| 29 | - <span v-if="order.state === 5">已取消</span> | ||
| 30 | - </p> | ||
| 31 | - <p> | ||
| 32 | - <span>售后状态:</span> | ||
| 33 | - <span>{{ order.afterStateName }}</span> | ||
| 34 | - </p> | ||
| 35 | - </li> | ||
| 36 | - <li> | ||
| 37 | - <p> | ||
| 38 | - <span>支付方式:</span> | ||
| 39 | - <span v-if="order.paymentMode === 1">微信</span> | ||
| 40 | - <span v-if="order.paymentMode === 2">支付宝</span> | ||
| 41 | - </p> | ||
| 42 | - <p> | ||
| 43 | - <span>物流方案:</span> | ||
| 44 | - <span>{{ order.logisticsName }}</span> | ||
| 45 | - </p> | ||
| 46 | - </li> | ||
| 47 | - <li> | ||
| 48 | - <p> | ||
| 49 | - <span>创建时间:</span> | ||
| 50 | - <span>{{ order.createTime }}</span> | ||
| 51 | - </p> | ||
| 52 | - <p> | ||
| 53 | - <span>支付时间:</span> | ||
| 54 | - <span>{{ order.paymentTime }}</span> | ||
| 55 | - </p> | ||
| 56 | - </li> | ||
| 57 | - <li> | ||
| 58 | - <p>备注:{{ order.remark }}</p> | ||
| 59 | - </li> | ||
| 60 | - </ul> | ||
| 61 | - </div> | ||
| 62 | - <div class="goods_info"> | ||
| 63 | - <h2>商品信息</h2> | ||
| 64 | - <div | ||
| 65 | - v-for="(item, index) in order.products" | ||
| 66 | - :key="index" | ||
| 67 | - class="goods_list" | ||
| 68 | - > | ||
| 69 | - <div class="good_price"> | 2 | + <el-dialog :close-on-click-modal="false" title="详情" :visible.sync="visible" custom-class="bian_css" width="65%"> |
| 3 | + <div v-loading="loading" class="order_details"> | ||
| 4 | + <!-- <el-button plain @click="close">关闭</el-button> --> | ||
| 5 | + <!-- 关闭 --> | ||
| 6 | + <!-- <el-button icon="el-icon-close" class="close" @click="close" />--> | ||
| 7 | + <div class="cotent"> | ||
| 8 | + <div class="left_part"> | ||
| 9 | + <div class="order_info"> | ||
| 10 | + <h2>售后信息</h2> | ||
| 11 | + <ul> | ||
| 12 | + <li> | ||
| 13 | + <p> | ||
| 14 | + <span>售后单号:</span> | ||
| 15 | + <span>{{ order.afterFormid }}</span> | ||
| 16 | + </p> | ||
| 17 | + <p> | ||
| 18 | + <span>订单ID:</span> | ||
| 19 | + <span>{{ order.orderId }}</span> | ||
| 20 | + </p> | ||
| 21 | + </li> | ||
| 22 | + <li> | ||
| 23 | + <p> | ||
| 24 | + <span>订单状态:</span> | ||
| 25 | + <span v-if="order.state === 1">待付款</span> | ||
| 26 | + <span v-if="order.state === 2">待发货</span> | ||
| 27 | + <span v-if="order.state === 3">待收货</span> | ||
| 28 | + <span v-if="order.state === 4">已完成</span> | ||
| 29 | + <span v-if="order.state === 5">已取消</span> | ||
| 30 | + </p> | ||
| 31 | + <p> | ||
| 32 | + <span>售后类型:</span> | ||
| 33 | + <span v-if="order.afterType === 1">仅退款</span> | ||
| 34 | + <span v-if="order.afterType === 2">退货退款</span> | ||
| 35 | + </p> | ||
| 36 | + </li> | ||
| 37 | + <li> | ||
| 38 | + <p> | ||
| 39 | + <span>退款金额:</span> | ||
| 40 | + <span>{{ order.price }}</span> | ||
| 41 | + </p> | ||
| 42 | + <p> | ||
| 43 | + <span>买家账户:</span> | ||
| 44 | + <span>{{ order.customerName }}</span> | ||
| 45 | + </p> | ||
| 46 | + </li> | ||
| 47 | + <li> | ||
| 48 | + <p> | ||
| 49 | + <span>申请时间:</span> | ||
| 50 | + <span>{{ order.createTime }}</span> | ||
| 51 | + </p> | ||
| 52 | + <p> | ||
| 53 | + <span>最近处理时间:</span> | ||
| 54 | + <span>{{ order.updateTime }}</span> | ||
| 55 | + </p> | ||
| 56 | + </li> | ||
| 57 | + <li> | ||
| 58 | + <span>备注:</span> | ||
| 59 | + <span>{{ order.remark }}</span> | ||
| 60 | + </li> | ||
| 61 | + </ul> | ||
| 62 | + </div> | ||
| 63 | + <div class="goods_info"> | ||
| 64 | + <h2>商品信息</h2> | ||
| 65 | + <div | ||
| 66 | + v-for="(item, index) in order.products" | ||
| 67 | + :key="index" | ||
| 68 | + class="goods_list" | ||
| 69 | + > | ||
| 70 | + <!-- <div class="good_price"> | ||
| 70 | <ul> | 71 | <ul> |
| 71 | <li> | 72 | <li> |
| 72 | - <p>商品总价: ¥{{ order.orderPrice }}</p> | 73 | + <p>商品总价: ¥{{ item.total }}</p> |
| 73 | <p>支付金额: ¥{{ order.price }}</p> | 74 | <p>支付金额: ¥{{ order.price }}</p> |
| 74 | </li> | 75 | </li> |
| 75 | <li> | 76 | <li> |
| 76 | <p>物流费用: ￥{{ order.logisticsPrice }}</p> | 77 | <p>物流费用: ￥{{ order.logisticsPrice }}</p> |
| 77 | </li> | 78 | </li> |
| 78 | </ul> | 79 | </ul> |
| 80 | + </div> --> | ||
| 81 | + <div class="good_details"> | ||
| 82 | + <ul> | ||
| 83 | + <li> | ||
| 84 | + <img :src="item.image"> | ||
| 85 | + <div class="details"> | ||
| 86 | + <p>{{ item.productName }}</p> | ||
| 87 | + <div class="skuDetails"> | ||
| 88 | + <p | ||
| 89 | + v-for="(detailsItem, detailsindex) of item.skuDetails" | ||
| 90 | + :key="detailsindex" | ||
| 91 | + > | ||
| 92 | + {{ detailsItem.skuValue }} | ||
| 93 | + </p> | ||
| 94 | + </div> | ||
| 95 | + <p>SKU: {{ item.skuId }}</p> | ||
| 96 | + </div> | ||
| 97 | + </li> | ||
| 98 | + <li class="cen"> | ||
| 99 | + <p>¥{{ `${item.productPrice} * ${item.number}` }}</p> | ||
| 100 | + </li> | ||
| 101 | + <li> | ||
| 102 | + <p v-if="order.afterType === 1">仅退款</p> | ||
| 103 | + <p v-if="order.afterType === 2">退货退款</p> | ||
| 104 | + </li> | ||
| 105 | + <li> | ||
| 106 | + <p class="fontWeight">¥{{ item.total }}</p> | ||
| 107 | + </li> | ||
| 108 | + </ul> | ||
| 109 | + <div class="totalRefund"> | ||
| 110 | + 运费金额： | ||
| 111 | + <span class="fontWeight">¥{{ order.logisticsPrice }}</span> | ||
| 112 | + </div> | ||
| 113 | + <div class="totalRefund"> | ||
| 114 | + 退款总金额： | ||
| 115 | + <span class="fontWeight">¥{{ order.price }}</span> | ||
| 116 | + </div> | ||
| 117 | + </div> | ||
| 79 | </div> | 118 | </div> |
| 80 | - <div class="good_details"> | ||
| 81 | - <ul> | ||
| 82 | - <li> | ||
| 83 | - <img :src="item.image"> | ||
| 84 | - <div class="details"> | ||
| 85 | - <p>{{ item.productName }}</p> | ||
| 86 | - <p class="skuDetails"> | ||
| 87 | - <span | ||
| 88 | - v-for="(detailsItem, detailsindex) of item.skuDetails" | ||
| 89 | - :key="detailsindex" | ||
| 90 | - class="detail_span" | ||
| 91 | - > | ||
| 92 | - {{ detailsItem.skuName }}: {{ detailsItem.skuValue }} | ||
| 93 | - </span> | ||
| 94 | - </p> | ||
| 95 | - <p>SKU: {{ item.skuId }}</p> | 119 | + </div> |
| 120 | + <div class="logistics_info"> | ||
| 121 | + <h2>售后记录</h2> | ||
| 122 | + <div class="after_sales_record"> | ||
| 123 | + <div | ||
| 124 | + v-for="(item, index) in order.afterHistory" | ||
| 125 | + :key="index" | ||
| 126 | + class="record_list" | ||
| 127 | + > | ||
| 128 | + <div class="record_list_title"> | ||
| 129 | + <p>{{ item.title }}</p> | ||
| 130 | + <div> | ||
| 131 | + <p>买家名称：{{ item.name }}</p> | ||
| 132 | + <p>申请时间：{{ item.time }}</p> | ||
| 96 | </div> | 133 | </div> |
| 97 | - </li> | ||
| 98 | - <li class="cen"> | ||
| 99 | - ¥{{ `${item.productPrice} * ${item.number}` }} | ||
| 100 | - </li> | ||
| 101 | - <li> | ||
| 102 | - {{ order.orderPrice }} | ||
| 103 | - </li> | ||
| 104 | - </ul> | 134 | + <p>留言：{{ item.reason }}</p> |
| 135 | + </div> | ||
| 136 | + </div> | ||
| 137 | + <div class="record_list_content"> | ||
| 138 | + <!-- <p>--> | ||
| 139 | + <!-- <!– <span>{{ item.type }}:</span> –>--> | ||
| 140 | + <!-- <span>{{ item.actionNote }}</span>--> | ||
| 141 | + <!-- </p>--> | ||
| 142 | + <div v-if="order.images && order.images.length != 0" class="proofBox"> | ||
| 143 | + <h3>买家举证图片:</h3> | ||
| 144 | + <div class="imgBox"> | ||
| 145 | + <el-image v-for="(item, index) of order.images" :key="index" :src="item" :preview-src-list="order.images" alt /> | ||
| 146 | + </div> | ||
| 147 | + </div> | ||
| 148 | + </div> | ||
| 149 | + </div> | ||
| 150 | + <div v-if="order.afterType !== 1" class="logistics_content"> | ||
| 151 | + <p class="logistics_title"> | ||
| 152 | + <span>物流公司: {{ order.express }}</span> | ||
| 153 | + <span>运单号: {{ order.deliverFormid }}</span> | ||
| 154 | + </p> | ||
| 105 | </div> | 155 | </div> |
| 106 | </div> | 156 | </div> |
| 107 | </div> | 157 | </div> |
| 108 | - <!-- 未发货时物流信息显示去发货按钮 --> | ||
| 109 | - <div class="logistics_info" v-show="order.logisticsName && order.logisticsNum"> | ||
| 110 | - <h2>物流信息</h2> | ||
| 111 | - <!-- <p | ||
| 112 | - v-if="!order.logisticsNum" | ||
| 113 | - class="send_good" | ||
| 114 | - @click="send" | ||
| 115 | - > | ||
| 116 | - 去发货 | ||
| 117 | - </p>--> | ||
| 118 | - <el-button | ||
| 119 | - v-if="!order.logisticsNum && order.state == 2" | ||
| 120 | - type="primary" | ||
| 121 | - class="send_good" | ||
| 122 | - @click="send" | ||
| 123 | - >去发货</el-button> | ||
| 124 | - <div v-else class="logistics_content"> | ||
| 125 | - <p class="logistics_title"> | ||
| 126 | - <span>物流公司: {{ order.logisticsName }}</span> | ||
| 127 | - <span>运单号: {{ order.logisticsNum }}</span> | ||
| 128 | - </p> | ||
| 129 | - <!-- <p | ||
| 130 | - v-for="(item, index) in tracesList" | ||
| 131 | - :key="index" | ||
| 132 | - class="logistics_item" | ||
| 133 | - > | ||
| 134 | - <span>{{ item.acceptTime }}</span> | ||
| 135 | - <span>{{ acceptStation }}</span> | ||
| 136 | - </p> --> | 158 | + <div class="right_part"> |
| 159 | + <div v-if="showOne || showTwo" class="preO"> | ||
| 160 | + <div class="topTips"> | ||
| 161 | + <div class="leftImg"> | ||
| 162 | + <img src="../../../assets/images/tips.png" alt> | ||
| 163 | + </div> | ||
| 164 | + <div class="rTitle"> | ||
| 165 | + <b>等待商家处理</b> | ||
| 166 | + <p>买家已发起售后申请，请尽快处理</p> | ||
| 167 | + </div> | ||
| 168 | + </div> | ||
| 169 | + <div class="buyerR">买家说明:{{ order.explain }}</div> | ||
| 170 | + </div> | ||
| 171 | + <div v-if="showThree" class="preO"> | ||
| 172 | + <div class="topTips"> | ||
| 173 | + <div class="leftImg"> | ||
| 174 | + <img src="../../../assets/images/tips.png" alt> | ||
| 175 | + </div> | ||
| 176 | + <div class="rTitle"> | ||
| 177 | + <b>买家已退回</b> | ||
| 178 | + <p>请注意检查货物是否达到退款标准，如未达到，请联系买家协商</p> | ||
| 179 | + </div> | ||
| 180 | + </div> | ||
| 181 | + <div class="buyerR">物流公司:{{ order.express }}</div> | ||
| 182 | + <div class="buyerR">物流单号:{{ order.deliverFormid }}</div> | ||
| 183 | + </div> | ||
| 184 | + <div class="btnList"> | ||
| 185 | + <div v-if="showOne" class="lists"> | ||
| 186 | + <div class="btns" @click="agree(5)">同意退款申请</div> | ||
| 187 | + <div class="btns" @click="agree(2)">拒绝退款申请</div> | ||
| 188 | + </div> | ||
| 189 | + <div v-if="showTwo" class="lists"> | ||
| 190 | + <div class="btns" @click="agree(1)">同意申请</div> | ||
| 191 | + <div class="btns" @click="agree(2)">拒绝申请</div> | ||
| 192 | + </div> | ||
| 193 | + <div v-if="showThree" class="lists"> | ||
| 194 | + <div class="btns" @click="agree(3)">确认收货且退款</div> | ||
| 195 | + <div class="btns" @click="agree(4)">货物有损拒绝退款</div> | ||
| 196 | + </div> | ||
| 137 | </div> | 197 | </div> |
| 138 | </div> | 198 | </div> |
| 139 | </div> | 199 | </div> |
| 140 | - <div class="right_part"> | ||
| 141 | - <div class="pay_order_info"> | ||
| 142 | - <h2>下单人信息</h2> | ||
| 143 | - <p>下单账户: {{ order.customerName }}</p> | ||
| 144 | - <p>订单总数: {{ order.total }}个</p> | ||
| 145 | - <p>下单备注: {{ order.remark }}</p> | 200 | + <!-- *********************************弹框开始********************************* --> |
| 201 | + <!-- 申请弹框 --> | ||
| 202 | + <el-dialog | ||
| 203 | + :visible.sync="isVisible" | ||
| 204 | + :title="title" | ||
| 205 | + width="30%" | ||
| 206 | + top="32vh" | ||
| 207 | + center | ||
| 208 | + :append-to-body="true" | ||
| 209 | + :close-on-click-modal="false" | ||
| 210 | + > | ||
| 211 | + <div v-if="title === '同意申请'" class="agreeTitle"> | ||
| 212 | + 同意申请后，系统将自动发送你的退款地址给买家 | ||
| 213 | + </div> | ||
| 214 | + <div v-if="title === '拒绝退款申请'" class="agreeTitle2"> | ||
| 215 | + <div class="tiTop"> | ||
| 216 | + 请与买家协商好后再操作，拒绝后买家仍可以再次申请 | ||
| 217 | + </div> | ||
| 218 | + <el-input | ||
| 219 | + v-model="textarea" | ||
| 220 | + type="textarea" | ||
| 221 | + :autosize="{ minRows: 2, maxRows: 4 }" | ||
| 222 | + placeholder="请输入留言" | ||
| 223 | + /> | ||
| 146 | </div> | 224 | </div> |
| 147 | - <div class="take_goods_info"> | ||
| 148 | - <h2>收货信息</h2> | ||
| 149 | - <p>姓名: {{ order.receiveName }}</p> | ||
| 150 | - <p>手机号: {{ order.receivePhone }}</p> | ||
| 151 | - <p>地址: {{ order.receiveAdress }}</p> | 225 | + <div v-if="title === '确认收货且退款'" class="agreeTitle2"> |
| 226 | + <div class="tiTop">已确认商品无误，退款给买家</div> | ||
| 152 | </div> | 227 | </div> |
| 153 | - </div> | ||
| 154 | - </div> | ||
| 155 | - <!-- 发货 --> | ||
| 156 | - <el-dialog | ||
| 157 | - :visible.sync="isVisible" | ||
| 158 | - title="发货" | ||
| 159 | - custom-class="bian_css" | ||
| 160 | - :close-on-click-modal="false" | ||
| 161 | - :modal-append-to-body="false" | ||
| 162 | - :modal="false" | ||
| 163 | - > | ||
| 164 | - <el-form | ||
| 165 | - ref="sendGoodsForm" | ||
| 166 | - :model="form" | ||
| 167 | - :rules="rules" | ||
| 168 | - label-width="80px" | ||
| 169 | - > | ||
| 170 | - <el-form-item label="快递公司" prop="express"> | ||
| 171 | - <el-select v-model="form.express" filterable> | ||
| 172 | - <el-option | ||
| 173 | - v-for="(item, index) in companyList" | ||
| 174 | - :key="index" | ||
| 175 | - :label="item.dictName" | ||
| 176 | - :value="item.dictId" | ||
| 177 | - /> | ||
| 178 | - </el-select> | ||
| 179 | - </el-form-item> | ||
| 180 | - <el-form-item label="快递单号" prop="deliverFormid"> | 228 | + <div v-if="title === '货物有损拒绝退款'" class="agreeTitle2"> |
| 229 | + <div class="tiTop">我已确认货物有损，不予退款</div> | ||
| 181 | <el-input | 230 | <el-input |
| 182 | - v-model="form.deliverFormid" | ||
| 183 | - oninput="value = value.replace(/[^\a-\z\A-\Z0-9]/g,'')" | 231 | + v-model="textarea" |
| 232 | + type="textarea" | ||
| 233 | + :autosize="{ minRows: 2, maxRows: 4 }" | ||
| 234 | + placeholder="请输入留言" | ||
| 184 | /> | 235 | /> |
| 185 | - </el-form-item> | 236 | + </div> |
| 237 | + <div v-if="title === '同意退款申请'" class="agreeTitle2"> | ||
| 238 | + <div class="tiTop">同意退款申请后，退款金额将返还至买家的支付渠道</div> | ||
| 239 | + </div> | ||
| 240 | + <span slot="footer" class="dialog-footer"> | ||
| 241 | + <el-button | ||
| 242 | + v-if="title === '同意申请'" | ||
| 243 | + type="primary" | ||
| 244 | + @click="agreeEn(1)" | ||
| 245 | + >同意申请</el-button> | ||
| 246 | + <el-button | ||
| 247 | + v-if="title === '拒绝退款申请'" | ||
| 248 | + type="primary" | ||
| 249 | + @click="agreeEn(2)" | ||
| 250 | + >拒绝申请</el-button> | ||
| 251 | + <el-button | ||
| 252 | + v-if="title === '确认收货且退款'" | ||
| 253 | + type="primary" | ||
| 254 | + @click="agreeEn(3)" | ||
| 255 | + >确认退款</el-button> | ||
| 256 | + <el-button | ||
| 257 | + v-if="title === '货物有损拒绝退款'" | ||
| 258 | + type="primary" | ||
| 259 | + @click="agreeEn(4)" | ||
| 260 | + >确 定</el-button> | ||
| 261 | + <el-button | ||
| 262 | + v-if="title === '同意退款申请'" | ||
| 263 | + type="primary" | ||
| 264 | + @click="agreeEn(5)" | ||
| 265 | + >同意退款</el-button> | ||
| 266 | + <el-button @click="isVisible = false">取 消</el-button> | ||
| 267 | + </span> | ||
| 268 | + </el-dialog> | ||
| 269 | + | ||
| 270 | + <!-- 发货 --> | ||
| 271 | + <el-dialog | ||
| 272 | + :visible.sync="isVisibles" | ||
| 273 | + title="发货" | ||
| 274 | + :close-on-click-modal="false" | ||
| 275 | + > | ||
| 276 | + <el-form | ||
| 277 | + ref="sendGoodsForm" | ||
| 278 | + :model="form" | ||
| 279 | + :rules="rules" | ||
| 280 | + label-width="80px" | ||
| 281 | + > | ||
| 282 | + <el-form-item label="快递公司" prop="express"> | ||
| 283 | + <el-select v-model="form.express" filterable> | ||
| 284 | + <el-option | ||
| 285 | + v-for="(item, index) in companyList" | ||
| 286 | + :key="index" | ||
| 287 | + :label="item.dictName" | ||
| 288 | + :value="item.dictId" | ||
| 289 | + /> | ||
| 290 | + </el-select> | ||
| 291 | + </el-form-item> | ||
| 292 | + <el-form-item label="快递单号" prop="deliverFormid"> | ||
| 293 | + <el-input v-model="form.deliverFormid" /> | ||
| 294 | + </el-form-item> | ||
| 186 | <!-- | 295 | <!-- |
| 187 | <el-form-item label="快递公司编号" prop="shipperCode" v-if="false"> | 296 | <el-form-item label="快递公司编号" prop="shipperCode" v-if="false"> |
| 188 | <el-input v-model="form.shipperCode" /> | 297 | <el-input v-model="form.shipperCode" /> |
| 189 | </el-form-item>--> | 298 | </el-form-item>--> |
| 190 | - </el-form> | ||
| 191 | - <span slot="footer" class="dialog-footer"> | ||
| 192 | - <el-button style="background-color: #3F9B6A;color: #fff" @click="confirm">确 定</el-button> | ||
| 193 | - <el-button @click="cancel" class="buttonHover" | ||
| 194 | - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button> | ||
| 195 | - </span> | ||
| 196 | - </el-dialog> | ||
| 197 | - </div> | 299 | + </el-form> |
| 300 | + <span slot="footer" class="dialog-footer"> | ||
| 301 | + <el-button style="background-color: #3F9B6A;color: #fff" @click="confirm">确 定</el-button> | ||
| 302 | + <el-button class="buttonHover" | ||
| 303 | + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="cancel">取 消</el-button> | ||
| 304 | + </span> | ||
| 305 | + </el-dialog> | ||
| 306 | + </div> | ||
| 307 | + </el-dialog> | ||
| 198 | </template> | 308 | </template> |
| 199 | 309 | ||
| 200 | <script> | 310 | <script> |
| 201 | -import { orderGetById, orderGetSelect, orderDilevery } from '@/api/order' | 311 | +import { |
| 312 | + aftersaleGetById, | ||
| 313 | + orderGetSelect, | ||
| 314 | + orderDilevery, | ||
| 315 | + refundSuccess, | ||
| 316 | + refundRefuse, | ||
| 317 | + success, | ||
| 318 | + refuse, | ||
| 319 | + confirmAndRefund, | ||
| 320 | + damaging | ||
| 321 | +} from '@/api/order' | ||
| 202 | export default { | 322 | export default { |
| 203 | - props: { | ||
| 204 | - detailRow: { | ||
| 205 | - type: Object, | ||
| 206 | - default: () => ({}) | ||
| 207 | - } | ||
| 208 | - }, | 323 | + name: 'AfterDetails', |
| 209 | data() { | 324 | data() { |
| 210 | return { | 325 | return { |
| 326 | + loading: false, | ||
| 327 | + visible: false, | ||
| 328 | + afterId: 0, | ||
| 211 | order: {}, | 329 | order: {}, |
| 330 | + isVisible: false, | ||
| 331 | + isVisibles: false, | ||
| 332 | + companyList: [], | ||
| 333 | + title: '同意申请', | ||
| 334 | + textarea: '', | ||
| 335 | + showOne: false, | ||
| 336 | + showTwo: false, | ||
| 337 | + showThree: false, | ||
| 212 | form: { | 338 | form: { |
| 213 | - orderId: this.orderId, | ||
| 214 | express: '', | 339 | express: '', |
| 215 | - deliverFormid: '' | 340 | + deliverFormid: '', |
| 341 | + orderId: '' | ||
| 216 | }, | 342 | }, |
| 217 | - isVisible: false, | ||
| 218 | rules: { | 343 | rules: { |
| 219 | logisticsName: [ | 344 | logisticsName: [ |
| 220 | { required: false, message: '请输入快递公司名称', trigger: 'blur' } | 345 | { required: false, message: '请输入快递公司名称', trigger: 'blur' } |
| @@ -225,62 +350,215 @@ export default { | @@ -225,62 +350,215 @@ export default { | ||
| 225 | express: [ | 350 | express: [ |
| 226 | { required: true, message: '请选择快递公司', trigger: 'blur' } | 351 | { required: true, message: '请选择快递公司', trigger: 'blur' } |
| 227 | ] | 352 | ] |
| 228 | - }, | ||
| 229 | - companyList: [] | ||
| 230 | - } | ||
| 231 | - }, | ||
| 232 | - watch: { | ||
| 233 | - detailRow: { | ||
| 234 | - handler (nVal, oVal) { | ||
| 235 | - if (nVal) { | ||
| 236 | - this.form.orderId = nVal.orderId | ||
| 237 | - this.getProductList() | ||
| 238 | - } | ||
| 239 | } | 353 | } |
| 240 | - }, | ||
| 241 | - deep: true | 354 | + } |
| 242 | }, | 355 | }, |
| 243 | - created() { | ||
| 244 | - this.form.orderId = this.detailRow.orderId | ||
| 245 | - this.getProductList() | 356 | + // computed: { |
| 357 | + // afterId() { | ||
| 358 | + // return this.$route.params.afterId | ||
| 359 | + // } | ||
| 360 | + // }, | ||
| 361 | + // created() { | ||
| 362 | + // console.log(this.afterId) | ||
| 363 | + // }, | ||
| 364 | + mounted() { | ||
| 365 | + this.getCompanyList() | ||
| 366 | + // setTimeout(() => { | ||
| 367 | + // this.btnShow(), | ||
| 368 | + // console.log('mounted') | ||
| 369 | + // }, 1000) | ||
| 246 | }, | 370 | }, |
| 247 | methods: { | 371 | methods: { |
| 372 | + show(id) { | ||
| 373 | + this.visible = true | ||
| 374 | + this.afterId = id | ||
| 375 | + this.getProductList() | ||
| 376 | + console.log(this.order, 'this.order') | ||
| 377 | + }, | ||
| 248 | async getProductList() { | 378 | async getProductList() { |
| 249 | - const res = await orderGetById({ orderId: this.detailRow.orderId }) | ||
| 250 | - this.order = res.data | 379 | + this.loading = true |
| 380 | + try { | ||
| 381 | + const res = await aftersaleGetById({ afterId: this.afterId }) | ||
| 382 | + this.order = res.data | ||
| 383 | + this.btnShow() | ||
| 384 | + } finally { | ||
| 385 | + this.loading = false | ||
| 386 | + } | ||
| 251 | }, | 387 | }, |
| 252 | - close() { | ||
| 253 | - this.$emit('cancel') | 388 | + async getCompanyList() { |
| 389 | + const res = await orderGetSelect() | ||
| 390 | + if (res.code === '') { | ||
| 391 | + this.companyList = res.data | ||
| 392 | + } | ||
| 254 | }, | 393 | }, |
| 394 | + // 发货 | ||
| 255 | confirm() { | 395 | confirm() { |
| 256 | this.$refs.sendGoodsForm.validate((valid) => { | 396 | this.$refs.sendGoodsForm.validate((valid) => { |
| 257 | if (valid) { | 397 | if (valid) { |
| 258 | - this.form.orderId = this.detailRow.orderId | 398 | + this.form.orderId = this.order.orderId |
| 259 | orderDilevery(this.form).then((res) => { | 399 | orderDilevery(this.form).then((res) => { |
| 260 | if (res.code === '') { | 400 | if (res.code === '') { |
| 261 | this.$message({ | 401 | this.$message({ |
| 262 | message: '发货成功', | 402 | message: '发货成功', |
| 263 | type: 'success' | 403 | type: 'success' |
| 264 | }) | 404 | }) |
| 265 | - this.isVisible = false | ||
| 266 | - this.close() | 405 | + this.isVisibles = false |
| 267 | } | 406 | } |
| 268 | }) | 407 | }) |
| 269 | } | 408 | } |
| 270 | }) | 409 | }) |
| 271 | }, | 410 | }, |
| 272 | cancel() { | 411 | cancel() { |
| 273 | - this.isVisible = false | 412 | + this.isVisibles = false |
| 274 | }, | 413 | }, |
| 275 | - async getCompanyList() { | ||
| 276 | - const res = await orderGetSelect() | ||
| 277 | - if (res.code === '') { | ||
| 278 | - this.companyList = res.data | 414 | + close() { |
| 415 | + this.visible = false | ||
| 416 | + }, | ||
| 417 | + // 申请弹框 | ||
| 418 | + agree(index) { | ||
| 419 | + if (index === 1) { | ||
| 420 | + this.title = '同意申请' | ||
| 421 | + this.isVisible = true | ||
| 422 | + } else if (index === 2) { | ||
| 423 | + this.title = '拒绝退款申请' | ||
| 424 | + this.isVisible = true | ||
| 425 | + } else if (index === 3) { | ||
| 426 | + this.title = '确认收货且退款' | ||
| 427 | + this.isVisible = true | ||
| 428 | + } else if (index === 4) { | ||
| 429 | + this.title = '货物有损拒绝退款' | ||
| 430 | + this.isVisible = true | ||
| 431 | + } else if (index === 5) { | ||
| 432 | + this.title = '同意退款申请' | ||
| 433 | + this.isVisible = true | ||
| 434 | + } else if (index === 9) { | ||
| 435 | + this.isVisibles = true | ||
| 436 | + this.form = { | ||
| 437 | + express: '', | ||
| 438 | + deliverFormid: '', | ||
| 439 | + orderId: 1 | ||
| 440 | + } | ||
| 279 | } | 441 | } |
| 280 | }, | 442 | }, |
| 281 | - send() { | ||
| 282 | - this.getCompanyList() | ||
| 283 | - this.isVisible = true | 443 | + // 同意申请 |
| 444 | + async agreeEn(index) { | ||
| 445 | + if (index === 1) { | ||
| 446 | + this.title = '同意申请' | ||
| 447 | + const res = await success({ | ||
| 448 | + orderId: this.order.orderId, | ||
| 449 | + afterId: this.order.afterId | ||
| 450 | + }) | ||
| 451 | + if (res.code === '') { | ||
| 452 | + this.$message({ | ||
| 453 | + message: '成功', | ||
| 454 | + type: 'success' | ||
| 455 | + }) | ||
| 456 | + this.isVisible = false | ||
| 457 | + this.$router.go(-1) | ||
| 458 | + } | ||
| 459 | + } else if (index === 2) { | ||
| 460 | + this.title = '拒绝退款申请' | ||
| 461 | + if (this.showOne) { | ||
| 462 | + const res = await refundRefuse({ | ||
| 463 | + orderId: this.order.orderId, | ||
| 464 | + afterId: this.order.afterId, | ||
| 465 | + reason: this.textarea | ||
| 466 | + }) | ||
| 467 | + if (res.code === '') { | ||
| 468 | + this.$message({ | ||
| 469 | + message: '成功', | ||
| 470 | + type: 'success' | ||
| 471 | + }) | ||
| 472 | + this.isVisible = false | ||
| 473 | + this.$router.go(-1) | ||
| 474 | + } | ||
| 475 | + } | ||
| 476 | + if (this.showTwo) { | ||
| 477 | + const res = await refuse({ | ||
| 478 | + orderId: this.order.orderId, | ||
| 479 | + afterId: this.order.afterId, | ||
| 480 | + reason: this.textarea | ||
| 481 | + }) | ||
| 482 | + if (res.code === '') { | ||
| 483 | + this.$message({ | ||
| 484 | + message: '成功', | ||
| 485 | + type: 'success' | ||
| 486 | + }) | ||
| 487 | + this.isVisible = false | ||
| 488 | + this.$router.go(-1) | ||
| 489 | + } | ||
| 490 | + } | ||
| 491 | + } else if (index === 3) { | ||
| 492 | + this.title = '确认收货且退款' | ||
| 493 | + const res = await confirmAndRefund({ | ||
| 494 | + orderId: this.order.orderId, | ||
| 495 | + afterId: this.order.afterId | ||
| 496 | + }) | ||
| 497 | + if (res.code === '') { | ||
| 498 | + this.$message({ | ||
| 499 | + message: '成功', | ||
| 500 | + type: 'success' | ||
| 501 | + }) | ||
| 502 | + this.isVisible = false | ||
| 503 | + this.$router.go(-1) | ||
| 504 | + } | ||
| 505 | + } else if (index === 4) { | ||
| 506 | + this.title = '货物有损拒绝退款' | ||
| 507 | + const res = await damaging({ | ||
| 508 | + orderId: this.order.orderId, | ||
| 509 | + afterId: this.order.afterId | ||
| 510 | + }) | ||
| 511 | + if (res.code === '') { | ||
| 512 | + this.$message({ | ||
| 513 | + message: '成功', | ||
| 514 | + type: 'success' | ||
| 515 | + }) | ||
| 516 | + this.isVisible = false | ||
| 517 | + this.$router.go(-1) | ||
| 518 | + } | ||
| 519 | + } else if (index === 5) { | ||
| 520 | + const res = await refundSuccess({ | ||
| 521 | + orderId: this.order.orderId, | ||
| 522 | + afterId: this.order.afterId | ||
| 523 | + }) | ||
| 524 | + if (res.code === '') { | ||
| 525 | + this.$message({ | ||
| 526 | + message: '成功', | ||
| 527 | + type: 'success' | ||
| 528 | + }) | ||
| 529 | + this.isVisible = false | ||
| 530 | + this.$router.go(-1) | ||
| 531 | + } | ||
| 532 | + if (res.code === '') { | ||
| 533 | + this.$message({ | ||
| 534 | + message: '成功', | ||
| 535 | + type: 'success' | ||
| 536 | + }) | ||
| 537 | + this.isVisible = false | ||
| 538 | + } | ||
| 539 | + } | ||
| 540 | + }, | ||
| 541 | + // 判断按钮展示 | ||
| 542 | + btnShow() { | ||
| 543 | + console.log(this.order, 'this.order') | ||
| 544 | + this.showOne = false | ||
| 545 | + this.showTwo = false | ||
| 546 | + this.showThree = false | ||
| 547 | + if ( | ||
| 548 | + this.order.afterType === 1 && | ||
| 549 | + (this.order.afterState === 1 || this.order.afterState === 5) | ||
| 550 | + ) { | ||
| 551 | + this.showOne = true | ||
| 552 | + } | ||
| 553 | + if ( | ||
| 554 | + this.order.afterType === 2 && | ||
| 555 | + (this.order.afterState === 1 || this.order.afterState === 5) | ||
| 556 | + ) { | ||
| 557 | + this.showTwo = true | ||
| 558 | + } | ||
| 559 | + if (this.order.afterType === 2 && this.order.afterState === 3) { | ||
| 560 | + this.showThree = true | ||
| 561 | + } | ||
| 284 | } | 562 | } |
| 285 | } | 563 | } |
| 286 | } | 564 | } |
| @@ -294,24 +572,17 @@ ul { | @@ -294,24 +572,17 @@ ul { | ||
| 294 | padding: 0; | 572 | padding: 0; |
| 295 | } | 573 | } |
| 296 | .order_details { | 574 | .order_details { |
| 297 | - h3 { | ||
| 298 | - // margin-left: 20px; | ||
| 299 | - margin: 20px 0 20px 20px; | ||
| 300 | - font-weight: 700; | ||
| 301 | - } | ||
| 302 | .close { | 575 | .close { |
| 303 | - // float: right; | ||
| 304 | position: absolute; | 576 | position: absolute; |
| 305 | right: 20px; | 577 | right: 20px; |
| 306 | &:hover { | 578 | &:hover { |
| 307 | cursor: pointer; | 579 | cursor: pointer; |
| 308 | } | 580 | } |
| 309 | } | 581 | } |
| 310 | - | ||
| 311 | .cotent { | 582 | .cotent { |
| 312 | - margin: 20px; | ||
| 313 | overflow: hidden; | 583 | overflow: hidden; |
| 314 | font-size: 14px; | 584 | font-size: 14px; |
| 585 | + margin: 20px; | ||
| 315 | .goods_info, | 586 | .goods_info, |
| 316 | .order_info, | 587 | .order_info, |
| 317 | .logistics_info, | 588 | .logistics_info, |
| @@ -321,12 +592,6 @@ ul { | @@ -321,12 +592,6 @@ ul { | ||
| 321 | margin-bottom: 10px; | 592 | margin-bottom: 10px; |
| 322 | padding: 10px 20px; | 593 | padding: 10px 20px; |
| 323 | } | 594 | } |
| 324 | - .pay_order_info, | ||
| 325 | - .take_goods_info{ | ||
| 326 | - p{ | ||
| 327 | - line-height: 30px; | ||
| 328 | - } | ||
| 329 | - } | ||
| 330 | h2 { | 595 | h2 { |
| 331 | margin: 0; | 596 | margin: 0; |
| 332 | font-weight: 400; | 597 | font-weight: 400; |
| @@ -342,14 +607,15 @@ ul { | @@ -342,14 +607,15 @@ ul { | ||
| 342 | .order_info { | 607 | .order_info { |
| 343 | box-sizing: border-box; | 608 | box-sizing: border-box; |
| 344 | ul { | 609 | ul { |
| 345 | - padding: 10px 30px; | 610 | + margin: 10px 20px; |
| 611 | + overflow: hidden; | ||
| 346 | li { | 612 | li { |
| 347 | overflow: hidden; | 613 | overflow: hidden; |
| 614 | + line-height: 30px; | ||
| 348 | p { | 615 | p { |
| 349 | - width: 50%; | ||
| 350 | float: left; | 616 | float: left; |
| 351 | font-size: 14px; | 617 | font-size: 14px; |
| 352 | - line-height: 30px; | 618 | + width: 50%; |
| 353 | span { | 619 | span { |
| 354 | &:nth-child(2) { | 620 | &:nth-child(2) { |
| 355 | margin-left: 10px; | 621 | margin-left: 10px; |
| @@ -358,9 +624,6 @@ ul { | @@ -358,9 +624,6 @@ ul { | ||
| 358 | } | 624 | } |
| 359 | } | 625 | } |
| 360 | } | 626 | } |
| 361 | - .remarks { | ||
| 362 | - margin-left: 30px !important; | ||
| 363 | - } | ||
| 364 | } | 627 | } |
| 365 | .goods_info { | 628 | .goods_info { |
| 366 | .goods_list { | 629 | .goods_list { |
| @@ -382,34 +645,44 @@ ul { | @@ -382,34 +645,44 @@ ul { | ||
| 382 | border-bottom: 1px gray solid; | 645 | border-bottom: 1px gray solid; |
| 383 | } | 646 | } |
| 384 | .good_details { | 647 | .good_details { |
| 648 | + overflow: hidden; | ||
| 385 | ul { | 649 | ul { |
| 386 | display: flex; | 650 | display: flex; |
| 387 | - margin-top:20px; | 651 | + padding:0 10px 20px 10px; |
| 652 | + border-bottom: 1px solid #ccc; | ||
| 388 | li { | 653 | li { |
| 389 | - flex: 3; | 654 | + flex: 5; |
| 390 | display: flex; | 655 | display: flex; |
| 391 | justify-content: space-around; | 656 | justify-content: space-around; |
| 392 | align-items: center; | 657 | align-items: center; |
| 393 | .details { | 658 | .details { |
| 394 | margin: 0 30px; | 659 | margin: 0 30px; |
| 395 | - width: 180px; | 660 | + width: 150px; |
| 396 | line-height: 20px; | 661 | line-height: 20px; |
| 397 | .skuDetails { | 662 | .skuDetails { |
| 398 | - margin-top: 8px; | ||
| 399 | - margin-bottom: 8px; | 663 | + display: flex; |
| 400 | margin-right: 10px; | 664 | margin-right: 10px; |
| 401 | - line-height: 1; | ||
| 402 | - color: #9e9e9e; | ||
| 403 | - .detail_span { | ||
| 404 | - margin-right: 8px; | ||
| 405 | - } | ||
| 406 | } | 665 | } |
| 407 | } | 666 | } |
| 408 | img { | 667 | img { |
| 409 | width: 50px; | 668 | width: 50px; |
| 410 | height: 50px; | 669 | height: 50px; |
| 411 | } | 670 | } |
| 671 | + &:nth-child(2) { | ||
| 672 | + display: block; | ||
| 673 | + } | ||
| 412 | } | 674 | } |
| 675 | + .cen{ | ||
| 676 | + margin-top: 5%; | ||
| 677 | + } | ||
| 678 | + } | ||
| 679 | + .totalRefund{ | ||
| 680 | + display: flex; | ||
| 681 | + justify-content: right; | ||
| 682 | + margin: 20px 40px 0 0; | ||
| 683 | + } | ||
| 684 | + .fontWeight{ | ||
| 685 | + font-weight: 700; | ||
| 413 | } | 686 | } |
| 414 | } | 687 | } |
| 415 | } | 688 | } |
| @@ -423,10 +696,9 @@ ul { | @@ -423,10 +696,9 @@ ul { | ||
| 423 | } | 696 | } |
| 424 | } | 697 | } |
| 425 | .logistics_content { | 698 | .logistics_content { |
| 426 | - padding: 0 10%; | 699 | + padding: 0 20px; |
| 427 | .logistics_title { | 700 | .logistics_title { |
| 428 | span { | 701 | span { |
| 429 | - margin: 20px 0; | ||
| 430 | display: inline-block; | 702 | display: inline-block; |
| 431 | width: 45%; | 703 | width: 45%; |
| 432 | } | 704 | } |
| @@ -442,8 +714,109 @@ ul { | @@ -442,8 +714,109 @@ ul { | ||
| 442 | } | 714 | } |
| 443 | 715 | ||
| 444 | .right_part { | 716 | .right_part { |
| 717 | + background: #fff; | ||
| 445 | float: left; | 718 | float: left; |
| 446 | width: 30%; | 719 | width: 30%; |
| 720 | + height: 600px; | ||
| 721 | + overflow: hidden; | ||
| 722 | + padding: 50px; | ||
| 723 | + font-size: 15px; | ||
| 724 | + .preO { | ||
| 725 | + .topTips { | ||
| 726 | + display: flex; | ||
| 727 | + justify-content: center; | ||
| 728 | + align-items: center; | ||
| 729 | + .leftImg { | ||
| 730 | + img { | ||
| 731 | + width: 50px; | ||
| 732 | + height: 50px; | ||
| 733 | + } | ||
| 734 | + } | ||
| 735 | + } | ||
| 736 | + .buyerR { | ||
| 737 | + text-align: left; | ||
| 738 | + margin-left: 53px; | ||
| 739 | + } | ||
| 740 | + } | ||
| 741 | + } | ||
| 742 | + } | ||
| 743 | + .record_list_content { | ||
| 744 | + img { | ||
| 745 | + width: 100px; | ||
| 746 | + height: 100px; | ||
| 747 | + } | ||
| 748 | + .proofBox { | ||
| 749 | + margin-top: 20px; | ||
| 750 | + .imgBox { | ||
| 751 | + padding-left: 20px; | ||
| 752 | + .el-image { | ||
| 753 | + margin-right: 15px; | ||
| 754 | + width: 100px; | ||
| 755 | + height: 100px; | ||
| 756 | + } | ||
| 757 | + } | ||
| 758 | + h3 { | ||
| 759 | + margin-bottom: 20px; | ||
| 760 | + } | ||
| 761 | + } | ||
| 762 | + } | ||
| 763 | +} | ||
| 764 | +.agreeTitle2 { | ||
| 765 | + text-align: center; | ||
| 766 | + font-size: 20px; | ||
| 767 | +} | ||
| 768 | +.btnList { | ||
| 769 | + display: flex; | ||
| 770 | + justify-content: center; | ||
| 771 | + margin-top: 30px; | ||
| 772 | + .lists { | ||
| 773 | + .btns { | ||
| 774 | + width: 200px; | ||
| 775 | + height: 50px; | ||
| 776 | + display: flex; | ||
| 777 | + justify-content: center; | ||
| 778 | + align-items: center; | ||
| 779 | + color: #fff; | ||
| 780 | + background: #3a68f2; | ||
| 781 | + margin-bottom: 20px; | ||
| 782 | + border-radius: 5px; | ||
| 783 | + cursor: pointer; | ||
| 784 | + } | ||
| 785 | + } | ||
| 786 | +} | ||
| 787 | +.after_sales_record { | ||
| 788 | + .record_list { | ||
| 789 | + padding: 0 20px; | ||
| 790 | + border-bottom: 1px solid gray; | ||
| 791 | + overflow: hidden; | ||
| 792 | + p{ | ||
| 793 | + line-height:30px | ||
| 794 | + } | ||
| 795 | + .record_list_title{ | ||
| 796 | + padding: 10px 0; | ||
| 797 | + div{ | ||
| 798 | + overflow: hidden; | ||
| 799 | + p{ | ||
| 800 | + float:left ; | ||
| 801 | + width: 50%; | ||
| 802 | + } | ||
| 803 | + } | ||
| 804 | + } | ||
| 805 | + .detail_title { | ||
| 806 | + font-size: 24px; | ||
| 807 | + color: #333333; | ||
| 808 | + position: relative; | ||
| 809 | + margin: 50px 20px 20px; | ||
| 810 | + &:before { | ||
| 811 | + content: ""; | ||
| 812 | + display: block; | ||
| 813 | + position: absolute; | ||
| 814 | + top: 5px; | ||
| 815 | + left: -20px; | ||
| 816 | + width: 4px; | ||
| 817 | + height: 24px; | ||
| 818 | + background-color: #3a68f2; | ||
| 819 | + } | ||
| 447 | } | 820 | } |
| 448 | } | 821 | } |
| 449 | } | 822 | } |
merchant-web-master/src/views/comprehensive/OrderRhq/index.vue
| 1 | <!-- --> | 1 | <!-- --> |
| 2 | <template> | 2 | <template> |
| 3 | - <div class="pending"> | ||
| 4 | - <div class="tab_show"> | ||
| 5 | - <el-tabs v-model="formInline.state" @tab-click="handleClick"> | ||
| 6 | - <el-tab-pane label="全部" :name="''" /> | ||
| 7 | - <el-tab-pane label="待付款" name="1" /> | ||
| 8 | - <el-tab-pane label="待发货" name="2" /> | ||
| 9 | - <el-tab-pane label="已发货" name="3" /> | ||
| 10 | - <el-tab-pane label="已完成" name="4" /> | ||
| 11 | - <el-tab-pane label="已关闭" name="5" /> | ||
| 12 | - </el-tabs> | ||
| 13 | - <!-- 搜索 --> | ||
| 14 | - <div class="formSearch"> | ||
| 15 | - <el-form :inline="true" :model="formInline" class="demo-form-inline"> | ||
| 16 | - <el-form-item> | ||
| 17 | - <div style="padding-top:6px"> | ||
| 18 | - <el-input v-model="formInline.search" placeholder="请输入内容" > | ||
| 19 | - <el-select | ||
| 20 | - slot="prepend" | ||
| 21 | - v-model="formInline.searchType" | ||
| 22 | - style="width:130px" | ||
| 23 | - placeholder="请选择" | 3 | +<div style="padding: 0 10px;background-color:#f7f7f7;"> |
| 4 | + <div class="tab_show"> | ||
| 5 | + <!-- <el-tabs v-model="formInline.type" @tab-click="handleClick"> | ||
| 6 | + <el-tab-pane label="全部" :name="null" /> | ||
| 7 | + </el-tabs> --> | ||
| 8 | + <!-- 搜索 --> | ||
| 24 | 9 | ||
| 25 | - > | ||
| 26 | - <el-option label="订单id" value="1" /> | ||
| 27 | - <el-option label="买家账户" value="2" /> | ||
| 28 | - <el-option label="收件人姓名" value="3" /> | ||
| 29 | - <el-option label="收件人手机号" value="4" /> | ||
| 30 | - <!-- <el-option label="商品ID" value="5" /> --> | ||
| 31 | - </el-select> | ||
| 32 | - </el-input> | ||
| 33 | - </div> | ||
| 34 | - </el-form-item> | ||
| 35 | - <el-form-item label="商户名称"> | ||
| 36 | - <el-input v-model="formInline.shopName" placeholder="请输入" /> | ||
| 37 | - </el-form-item> | ||
| 38 | - <!-- <el-form-item label="售后状态"> | ||
| 39 | - <el-select v-model="formInline.afterState" placeholder="请选择售后状态"> | ||
| 40 | - <el-option label="全部" :value="null" /> | ||
| 41 | - <el-option label="无售后" value="0" /> | ||
| 42 | - <el-option label="售后中" value="1" /> | ||
| 43 | - <el-option label="售后成功" value="2" /> | ||
| 44 | - <el-option label="售后关闭" value="3" /> | ||
| 45 | - </el-select> | ||
| 46 | - </el-form-item> --> | ||
| 47 | - <el-form-item label="下单时间"> | ||
| 48 | - <el-date-picker | ||
| 49 | - v-model="formInline.dates" | ||
| 50 | - type="daterange" | 10 | + <!-- 表格 --> |
| 11 | + <div class="tableBox"> | ||
| 12 | + <el-table | ||
| 13 | + ref="multipleTable" | ||
| 14 | + v-loading="loading" | ||
| 15 | + :data="tableData" | ||
| 16 | + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | ||
| 17 | + tooltip-effect="dark" | ||
| 18 | + > | ||
| 51 | 19 | ||
| 52 | - range-separator="至" | ||
| 53 | - start-placeholder="开始日期" | ||
| 54 | - end-placeholder="结束日期" | ||
| 55 | - /> | ||
| 56 | - </el-form-item> | ||
| 57 | - <el-form-item> | ||
| 58 | - <el-button @click="search" style="background-color: #3F9B6A;color: #fff;">查询</el-button> | ||
| 59 | - <el-button @click="orderDataExport" style="background-color: #3F9B6A;color: #fff;" >导出订单</el-button> | ||
| 60 | - </el-form-item> | ||
| 61 | - </el-form> | ||
| 62 | - </div> | ||
| 63 | - <!-- 表格 --> | ||
| 64 | - <div class="tableBox"> | ||
| 65 | - <el-table | ||
| 66 | - ref="multipleTable" | ||
| 67 | - v-loading="tableLoading" | ||
| 68 | - :data="tableData" | ||
| 69 | - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | ||
| 70 | - tooltip-effect="dark" | ||
| 71 | - > | ||
| 72 | - <el-table-column label="订单id" width="150"> | ||
| 73 | - <template slot-scope="scope">{{ scope.row.orderId }}</template> | ||
| 74 | - </el-table-column> | ||
| 75 | - <el-table-column prop="number" label="商品数量" width="100" /> | ||
| 76 | - <el-table-column prop="shopName" label="商户名称" width="220" show-overflow-tooltip /> | ||
| 77 | - <el-table-column prop="customerName" label="下单账户" show-overflow-tooltip /> | ||
| 78 | - <el-table-column prop="receiveName" label="收件人" show-overflow-tooltip /> | ||
| 79 | - <el-table-column prop="receivePhone" label="手机号" show-overflow-tooltip /> | ||
| 80 | - <el-table-column prop="price" label="支付金额（元）" width="120" /> | ||
| 81 | - <el-table-column prop="createTime" label="下单时间" show-overflow-tooltip /> | ||
| 82 | - <el-table-column label="订单状态" show-overflow-tooltip> | ||
| 83 | - <template slot-scope="scope"> | ||
| 84 | - <span v-if="scope.row.state == 1" :style="{color: '#E6A23C'}">待付款</span> | ||
| 85 | - <span v-if="scope.row.state == 2" :style="{color: '#F56C6C'}">待发货</span> | ||
| 86 | - <span v-if="scope.row.state == 3" :style="{color: '#409EFF'}">已发货</span> | ||
| 87 | - <span v-if="scope.row.state == 4" :style="{color: '#67C23A'}">已完成</span> | ||
| 88 | - <span v-if="scope.row.state == 5" :style="{color: '#909399'}">已关闭</span> | ||
| 89 | - </template> | ||
| 90 | - </el-table-column> | 20 | + <el-table-column prop="afterFormid" label="订单号" width="220" /> |
| 21 | + <el-table-column prop="afterId" label="售后类型" show-overflow-tooltip> | ||
| 22 | + <template slot-scope="scope"> | ||
| 23 | + <span v-if="scope.row.afterType == 1">仅退款</span> | ||
| 24 | + <span v-if="scope.row.afterType == 2">退货退款</span> | ||
| 25 | + </template> | ||
| 26 | + </el-table-column> | ||
| 27 | + <el-table-column prop="price" label="退款金额(元)" show-overflow-tooltip /> | ||
| 28 | + <el-table-column prop="afterStateName" label="审核状态" show-overflow-tooltip /> | ||
| 29 | + <el-table-column prop="createTime" label="审核时间" show-overflow-tooltip /> | ||
| 30 | + <el-table-column label="操作" show-overflow-tooltip> | ||
| 31 | + <template slot-scope="scope"> | ||
| 32 | + <div class="btnList"> | ||
| 91 | 33 | ||
| 92 | - <el-table-column label="操作" show-overflow-tooltip> | ||
| 93 | - <template slot-scope="scope"> | ||
| 94 | - <div class="btnList"> | ||
| 95 | - <div class="tableBtn greens" @click="seeMore(scope.row)">查看</div> | ||
| 96 | - </div> | ||
| 97 | - </template> | ||
| 98 | - </el-table-column> | ||
| 99 | - </el-table> | ||
| 100 | - <div class="fenye"> | ||
| 101 | - <el-pagination | ||
| 102 | - :current-page="formInline.page" | ||
| 103 | - :page-sizes="[10, 20, 50, 100]" | ||
| 104 | - :page-size="10" | ||
| 105 | - layout="total, sizes, prev, pager, next, jumper" | ||
| 106 | - :total="total" | ||
| 107 | - @size-change="handleSizeChange" | ||
| 108 | - @current-change="handleCurrentChange" | ||
| 109 | - /> | ||
| 110 | - </div> | 34 | + <div @click="view(scope.row)" class="tableBtn greens" >{{ scope.row.afterState == 1 ? '处理' : '查看' }}</div> |
| 35 | + </div> | ||
| 36 | + </template> | ||
| 37 | + </el-table-column> | ||
| 38 | + </el-table> | ||
| 39 | + <div class="fenye"> | ||
| 40 | + <el-pagination | ||
| 41 | + class="pagination" | ||
| 42 | + :current-page="currentPage" | ||
| 43 | + :page-size="10" | ||
| 44 | + background | ||
| 45 | + small | ||
| 46 | + :page-sizes="[10, 20, 50, 100]" | ||
| 47 | + layout="prev, pager, next,total" | ||
| 48 | + :total="total" | ||
| 49 | + @size-change="handleSizeChange" | ||
| 50 | + @current-change="handleCurrentChange" | ||
| 51 | + /> | ||
| 111 | </div> | 52 | </div> |
| 112 | </div> | 53 | </div> |
| 113 | - <el-dialog | ||
| 114 | - title="订单详情" | ||
| 115 | - :visible.sync="detailVisible" | ||
| 116 | - width="74%" | ||
| 117 | - center | ||
| 118 | - custom-class="bian_css" | ||
| 119 | - :close-on-click-modal="false" | ||
| 120 | - > | ||
| 121 | - <OrderDetail :detailRow="form" @cancel="cancel" /> | ||
| 122 | - </el-dialog> | ||
| 123 | </div> | 54 | </div> |
| 55 | + <after-details ref="afterDetails" /> | ||
| 56 | +</div> | ||
| 57 | + | ||
| 58 | + | ||
| 59 | + | ||
| 124 | </template> | 60 | </template> |
| 125 | 61 | ||
| 126 | <script> | 62 | <script> |
| 127 | -import OrderDetail from '@/views/order/ordersel/pendDetails.vue' | ||
| 128 | -import { orderGetAll , orderExport} from '@/api/order' | ||
| 129 | -import { async } from 'q'; | 63 | +// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等） |
| 64 | +// 例如：import 《组件名称》 from '《组件路径》'; | ||
| 65 | +import { aftersaleGetAll, afterOrderExport } from '@/api/order' | ||
| 66 | +import AfterDetails from './afterDetails'; | ||
| 67 | +import { type } from 'os'; | ||
| 130 | export default { | 68 | export default { |
| 131 | - components: { OrderDetail }, | ||
| 132 | - data () { | 69 | + components: { AfterDetails }, |
| 70 | + data() { | ||
| 133 | // 这里存放数据 | 71 | // 这里存放数据 |
| 134 | return { | 72 | return { |
| 73 | + loading: false, | ||
| 135 | activeName: 'first', | 74 | activeName: 'first', |
| 75 | + total: 1, | ||
| 76 | + tableData: [], | ||
| 77 | + currentPage: 1, | ||
| 136 | formInline: { | 78 | formInline: { |
| 137 | - searchType: '1', | 79 | + searchType: '1', // 搜索类型 1-订单ID 2-买家账户 3-收件人姓名 4-收件人手机号 5-商品ID |
| 138 | search: '', // 搜索字段 | 80 | search: '', // 搜索字段 |
| 139 | - state: '', | ||
| 140 | - // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭 | ||
| 141 | - dates: [], // 下单时间数组 | 81 | + state: '', // 订单状态 1-待付款 2-待发货 3-已发货 4-已完成 5-已关闭 |
| 82 | + afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭 | ||
| 83 | + afterType: '', // 售后类型 1-仅退款 2-退货退款 | ||
| 84 | + type: null, // 列表类型 1-待商家处理 2-待商家收货 | ||
| 142 | page: 1, | 85 | page: 1, |
| 143 | - shopName: '', | ||
| 144 | - pageSize: 10 | 86 | + pageSize: 10, |
| 87 | + afterStateList:[9,10] | ||
| 145 | }, | 88 | }, |
| 146 | - total: 1, | ||
| 147 | - tableData: [], | ||
| 148 | - tableLoading: false, | ||
| 149 | - detailVisible: false, | ||
| 150 | - form: {} | 89 | + |
| 90 | + multipleSelection: [] | ||
| 151 | } | 91 | } |
| 152 | }, | 92 | }, |
| 93 | + // 监听属性 类似于data概念 | ||
| 94 | + computed: {}, | ||
| 95 | + // 监控data中的数据变化 | ||
| 96 | + watch: {}, | ||
| 97 | + // 生命周期 - 创建完成（可以访问当前this实例） | ||
| 98 | + created() {}, | ||
| 153 | // 生命周期 - 挂载完成（可以访问DOM元素） | 99 | // 生命周期 - 挂载完成（可以访问DOM元素） |
| 154 | mounted() { | 100 | mounted() { |
| 155 | this.getAll(this.formInline) | 101 | this.getAll(this.formInline) |
| 156 | - this.handleClick({ name: '' }) | ||
| 157 | }, | 102 | }, |
| 158 | // 方法集合 | 103 | // 方法集合 |
| 159 | methods: { | 104 | methods: { |
| 160 | - handleSizeChange (val) { | 105 | + handleSizeChange(val) { |
| 161 | this.formInline.pageSize = val | 106 | this.formInline.pageSize = val |
| 162 | this.getAll(this.formInline) | 107 | this.getAll(this.formInline) |
| 163 | }, | 108 | }, |
| 164 | - handleCurrentChange (val) { | 109 | + handleCurrentChange(val) { |
| 165 | this.formInline.page = val | 110 | this.formInline.page = val |
| 166 | this.getAll(this.formInline) | 111 | this.getAll(this.formInline) |
| 167 | }, | 112 | }, |
| 168 | - handleClick (tab, event) { | ||
| 169 | - this.page = 1 | ||
| 170 | - this.formInline.state = tab.name | ||
| 171 | - this.formInline.page = 1 | 113 | + handleClick(tab, event) { |
| 114 | + this.formInline.type = tab.name | ||
| 172 | this.getAll(this.formInline) | 115 | this.getAll(this.formInline) |
| 173 | }, | 116 | }, |
| 174 | // 查询 | 117 | // 查询 |
| 175 | - search () { | 118 | + search() { |
| 176 | this.total = 1 | 119 | this.total = 1 |
| 177 | this.formInline.page = 1 | 120 | this.formInline.page = 1 |
| 178 | this.getAll(this.formInline) | 121 | this.getAll(this.formInline) |
| 179 | }, | 122 | }, |
| 180 | - // 详情 | ||
| 181 | - seeMore (row) { | ||
| 182 | - this.detailVisible = true | ||
| 183 | - this.form = row | ||
| 184 | - // this.$router.push({ | ||
| 185 | - // name: 'pendDetails', | ||
| 186 | - // params: { orderId: row.orderId } | ||
| 187 | - // }) | ||
| 188 | - }, | ||
| 189 | - cancel () { | ||
| 190 | - this.detailVisible = false | 123 | + // 处理 |
| 124 | + view(row) { | ||
| 125 | + this.$refs.afterDetails.show(row.afterId) | ||
| 191 | }, | 126 | }, |
| 192 | // 初始化查询所有数据 | 127 | // 初始化查询所有数据 |
| 193 | - async getAll (formInline) { | ||
| 194 | - this.tableLoading = true | ||
| 195 | - const res = await orderGetAll(formInline) | ||
| 196 | - this.tableData = res.data.list | ||
| 197 | - this.total = res.data.total | ||
| 198 | - this.tableLoading = false | 128 | + async getAll(formInline) { |
| 129 | + this.loading = true | ||
| 130 | + try { | ||
| 131 | + const res = await aftersaleGetAll(formInline) | ||
| 132 | + this.total = res.data.total | ||
| 133 | + this.tableData = res.data.list | ||
| 134 | + } finally { | ||
| 135 | + this.loading = false | ||
| 136 | + } | ||
| 199 | }, | 137 | }, |
| 200 | // 导出订单 | 138 | // 导出订单 |
| 201 | - async orderDataExport() { | 139 | + async afterOrderDataExport() { |
| 202 | this.$message({ | 140 | this.$message({ |
| 203 | message: '数据导出中，请勿重复操作！', | 141 | message: '数据导出中，请勿重复操作！', |
| 204 | type: 'success' | 142 | type: 'success' |
| 205 | }) | 143 | }) |
| 206 | - const res = await orderExport(this.formInline) | ||
| 207 | - if(!res){ | 144 | + console.log(this.formInline, 'this.formInline') |
| 145 | + const res = await afterOrderExport(this.formInline) | ||
| 146 | + if (!res) { | ||
| 208 | return | 147 | return |
| 209 | } | 148 | } |
| 210 | - const blob = new Blob([res], { type: 'application/vnd.ms-excel' }) | ||
| 211 | - const fileName = '订单数据明细表.xls' | 149 | + const blob = new Blob([res], { type: 'application/vnd.ms-excel' }) // 把得到的结果用流对象转一下 |
| 150 | + const fileName = '售后订单数据明细表.xls' | ||
| 212 | if ('download' in document.createElement('a')) { | 151 | if ('download' in document.createElement('a')) { |
| 213 | - // 非IE下载 | ||
| 214 | - const elink = document.createElement('a') | ||
| 215 | - elink.download = fileName | ||
| 216 | - elink.style.display = 'none' | ||
| 217 | - elink.href = URL.createObjectURL(blob) | ||
| 218 | - document.body.appendChild(elink) | ||
| 219 | - elink.click() | ||
| 220 | - URL.revokeObjectURL(elink.href) // 释放URL 对象 | ||
| 221 | - document.body.removeChild(elink) | ||
| 222 | - } else { | 152 | + // 非IE下载 |
| 153 | + const elink = document.createElement('a') | ||
| 154 | + elink.download = fileName | ||
| 155 | + elink.href = URL.createObjectURL(blob) // 将流文件写入a标签的href属性值 | ||
| 156 | + elink.style.display = 'none' // 障眼法藏起来a标签 | ||
| 157 | + document.body.appendChild(elink) // 将a标签追加到文档对象中 | ||
| 158 | + elink.click() // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了 | ||
| 159 | + URL.revokeObjectURL(elink.href) // 释放URL 对象 | ||
| 160 | + document.body.removeChild(elink) | ||
| 161 | + } else { | ||
| 223 | // IE10+下载 | 162 | // IE10+下载 |
| 224 | navigator.msSaveBlob(blob, fileName) | 163 | navigator.msSaveBlob(blob, fileName) |
| 225 | } | 164 | } |
| @@ -231,10 +170,23 @@ export default { | @@ -231,10 +170,23 @@ export default { | ||
| 231 | //@import url(); 引入公共css类 | 170 | //@import url(); 引入公共css类 |
| 232 | @import url("../../../styles/elDialog.scss"); | 171 | @import url("../../../styles/elDialog.scss"); |
| 233 | .tab_show { | 172 | .tab_show { |
| 234 | - padding-left: 30px; | 173 | + padding: 0 20px 20px 20px; |
| 235 | background-color:#fff; | 174 | background-color:#fff; |
| 236 | } | 175 | } |
| 237 | -.pending{ | ||
| 238 | - min-height:90vh; | 176 | +.fenye { |
| 177 | + margin-top: 20px; | ||
| 178 | + display: flex; | ||
| 179 | + justify-content: flex-end; | ||
| 180 | + position: relative; | ||
| 239 | } | 181 | } |
| 182 | + ::v-deep .el-pagination__total { | ||
| 183 | + position: absolute; | ||
| 184 | + left: 10px; | ||
| 185 | + } | ||
| 186 | + .formSearch { | ||
| 187 | + display: flex; | ||
| 188 | + width: 100%; | ||
| 189 | + font-size: 14px; | ||
| 190 | + justify-content: space-between; | ||
| 191 | + } | ||
| 240 | </style> | 192 | </style> |
merchant-web-master/src/views/stockControl/inventory/index.vue
| @@ -629,8 +629,12 @@ export default { | @@ -629,8 +629,12 @@ export default { | ||
| 629 | }) | 629 | }) |
| 630 | }, | 630 | }, |
| 631 | async rukuCheck(){ | 631 | async rukuCheck(){ |
| 632 | - await getClassifyUpdate({productId:this.shopId,registrationStatus:this.dengjiMsg}) | 632 | + const targetProduct = this.tableData.find(item => item.productId === this.shopId) |
| 633 | + targetProduct.registrationStatus = this.dengjiMsg | ||
| 634 | + await getClassifyUpdate(targetProduct) | ||
| 633 | this.$message.success('保存成功') | 635 | this.$message.success('保存成功') |
| 636 | + this.rukuShow = false | ||
| 637 | + this.getAll(this.formInline) | ||
| 634 | } | 638 | } |
| 635 | } | 639 | } |
| 636 | } | 640 | } |
wenjuan/src/layout/index.vue
| @@ -462,7 +462,7 @@ export default { | @@ -462,7 +462,7 @@ export default { | ||
| 462 | }, | 462 | }, |
| 463 | 463 | ||
| 464 | gzt () { | 464 | gzt () { |
| 465 | - window.location.href = 'https://admin-uat.028wlkj.com:1020/' | 465 | + window.location.href = 'https://admin.028wlkj.com:1020/' |
| 466 | }, | 466 | }, |
| 467 | findMatchingNames (List, msg) { | 467 | findMatchingNames (List, msg) { |
| 468 | return List.filter((item) => msg.includes(item.name)) | 468 | return List.filter((item) => msg.includes(item.name)) |
yanshouban/src/main.js
| @@ -32,6 +32,7 @@ Vue.prototype.$encrypt = encrypt; | @@ -32,6 +32,7 @@ Vue.prototype.$encrypt = encrypt; | ||
| 32 | Vue.prototype.$decrypt = decrypt; | 32 | Vue.prototype.$decrypt = decrypt; |
| 33 | Vue.prototype.$decryptall = decryptall; | 33 | Vue.prototype.$decryptall = decryptall; |
| 34 | Vue.prototype.$encryptall = encryptall; | 34 | Vue.prototype.$encryptall = encryptall; |
| 35 | +Vue.prototype.$btnFlax = false | ||
| 35 | // Vue.prototype.$API = 'https://wjdc.scjysm.asia:1443/meserver/api' | 36 | // Vue.prototype.$API = 'https://wjdc.scjysm.asia:1443/meserver/api' |
| 36 | // Vue.prototype.$API = 'http://8.130.38.56:8019/api' | 37 | // Vue.prototype.$API = 'http://8.130.38.56:8019/api' |
| 37 | // https://jy.scjysm.asia:18086 http://172.16.61.126:8080 http://8.130.38.56:8027 | 38 | // https://jy.scjysm.asia:18086 http://172.16.61.126:8080 http://8.130.38.56:8027 |
yanshouban/src/utils/request.js
| @@ -21,9 +21,9 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173' || host =='172.16.61.1 | @@ -21,9 +21,9 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173' || host =='172.16.61.1 | ||
| 21 | // PREFIX = 'http://172.16.61.48/meserver/admin-server'; | 21 | // PREFIX = 'http://172.16.61.48/meserver/admin-server'; |
| 22 | // PREFIX = 'http://8.130.38.56:9003'; | 22 | // PREFIX = 'http://8.130.38.56:9003'; |
| 23 | // PREFIX = 'http://8.130.38.56:8019/admin-server'; | 23 | // PREFIX = 'http://8.130.38.56:8019/admin-server'; |
| 24 | - // PREFIX = 'http://192.168.2.193:9003'; | 24 | + PREFIX = 'http://192.168.8.106:9003'; |
| 25 | // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'; | 25 | // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'; |
| 26 | - PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; | 26 | + // PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; |
| 27 | // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server'; | 27 | // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server'; |
| 28 | // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server' | 28 | // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server' |
| 29 | 29 |
yanshouban/src/views/activity/activitySp.vue
yanshouban/src/views/activity/index.vue
| @@ -2052,6 +2052,7 @@ | @@ -2052,6 +2052,7 @@ | ||
| 2052 | this.fileData = [] | 2052 | this.fileData = [] |
| 2053 | }, | 2053 | }, |
| 2054 | daoru(response, file, fileList){ | 2054 | daoru(response, file, fileList){ |
| 2055 | + this.daoData= [] | ||
| 2055 | this.daoData.push(file.raw) | 2056 | this.daoData.push(file.raw) |
| 2056 | const formDate = new FormData() | 2057 | const formDate = new FormData() |
| 2057 | formDate.append('file', this.daoData[0]) | 2058 | formDate.append('file', this.daoData[0]) |
yanshouban/src/views/ads/fangAudit/bianform.vue
| @@ -77,6 +77,13 @@ | @@ -77,6 +77,13 @@ | ||
| 77 | </el-upload> --> | 77 | </el-upload> --> |
| 78 | 78 | ||
| 79 | </el-form-item> | 79 | </el-form-item> |
| 80 | + <el-form-item label="审核状态" v-if="steat ==false"> | ||
| 81 | + | ||
| 82 | + <div style="line-height:40px;" > | ||
| 83 | + {{ruleForm.auditStatus =='1'?'待审核':ruleForm.auditStatus =='2'?'审核通过':ruleForm.auditStatus =='3'?'已驳回':''}} | ||
| 84 | + </div> | ||
| 85 | + | ||
| 86 | + </el-form-item> | ||
| 80 | <el-form-item label="状态" prop="mainPurpose" class="grid-content bg-purple" v-if="steat"> | 87 | <el-form-item label="状态" prop="mainPurpose" class="grid-content bg-purple" v-if="steat"> |
| 81 | <el-radio-group v-model="radio"> | 88 | <el-radio-group v-model="radio"> |
| 82 | <el-radio :label="3">通过</el-radio> | 89 | <el-radio :label="3">通过</el-radio> |
yanshouban/src/views/ads/fangli/bianform.vue
| @@ -83,6 +83,13 @@ | @@ -83,6 +83,13 @@ | ||
| 83 | <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens" v-if="steat == false && ruleForm.attachmentInfo" :href="ruleForm.attachmentInfo.url" target="_blank" download>{{ruleForm.attachmentInfo.name}}</a> | 83 | <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens" v-if="steat == false && ruleForm.attachmentInfo" :href="ruleForm.attachmentInfo.url" target="_blank" download>{{ruleForm.attachmentInfo.name}}</a> |
| 84 | 84 | ||
| 85 | </el-form-item> | 85 | </el-form-item> |
| 86 | + <el-form-item label="审核状态"> | ||
| 87 | + | ||
| 88 | + <div style="line-height:40px;" > | ||
| 89 | + {{ruleForm.auditStatus =='1'?'待审核':ruleForm.auditStatus =='2'?'审核通过':ruleForm.auditStatus =='3'?'已驳回':''}} | ||
| 90 | + </div> | ||
| 91 | + | ||
| 92 | + </el-form-item> | ||
| 86 | </el-form> | 93 | </el-form> |
| 87 | <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0"> | 94 | <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0"> |
| 88 | <el-button @click="close" class="buttonHover" | 95 | <el-button @click="close" class="buttonHover" |
| @@ -188,14 +195,10 @@ | @@ -188,14 +195,10 @@ | ||
| 188 | </el-table-column> | 195 | </el-table-column> |
| 189 | <el-table-column label="是否出租" prop="planningObjectives" min-width="100" > | 196 | <el-table-column label="是否出租" prop="planningObjectives" min-width="100" > |
| 190 | <template slot-scope="scope"> | 197 | <template slot-scope="scope"> |
| 191 | - {{scope.row.isrental == '0'?'否':'是'}} | ||
| 192 | - </template> | ||
| 193 | - </el-table-column> | ||
| 194 | - <el-table-column label="是否自营" prop="planningObjectives" min-width="100" > | ||
| 195 | - <template slot-scope="scope"> | ||
| 196 | - {{scope.row.isSelfOperated == '0'?'否':'是'}} | 198 | + {{scope.row.isrental == '0'?'自营':'是'}} |
| 197 | </template> | 199 | </template> |
| 198 | </el-table-column> | 200 | </el-table-column> |
| 201 | + | ||
| 199 | </el-table> | 202 | </el-table> |
| 200 | </div> | 203 | </div> |
| 201 | </div> | 204 | </div> |
yanshouban/src/views/ads/fangli/index.vue
| @@ -45,6 +45,7 @@ | @@ -45,6 +45,7 @@ | ||
| 45 | >新增</el-button | 45 | >新增</el-button |
| 46 | > | 46 | > |
| 47 | <el-upload class="upload-demo" ref="upload" | 47 | <el-upload class="upload-demo" ref="upload" |
| 48 | + v-if="this.$btnFlax" | ||
| 48 | :limit="1" | 49 | :limit="1" |
| 49 | accept=".xlsx" | 50 | accept=".xlsx" |
| 50 | :action="action" | 51 | :action="action" |
| @@ -157,7 +158,7 @@ | @@ -157,7 +158,7 @@ | ||
| 157 | label="审核提醒时间" | 158 | label="审核提醒时间" |
| 158 | prop="auditTime" | 159 | prop="auditTime" |
| 159 | min-width="150" | 160 | min-width="150" |
| 160 | - > | 161 | + v-if="this.$btnFlax" > |
| 161 | 162 | ||
| 162 | </el-table-column> | 163 | </el-table-column> |
| 163 | <el-table-column | 164 | <el-table-column |
| @@ -172,6 +173,7 @@ | @@ -172,6 +173,7 @@ | ||
| 172 | label="启用状态" | 173 | label="启用状态" |
| 173 | prop="enableStatus" | 174 | prop="enableStatus" |
| 174 | min-width="150" | 175 | min-width="150" |
| 176 | + v-if="this.$btnFlax" | ||
| 175 | > | 177 | > |
| 176 | <template slot-scope="scope"> | 178 | <template slot-scope="scope"> |
| 177 | {{scope.row.enableStatus =='0'?'启用':'禁用'}} | 179 | {{scope.row.enableStatus =='0'?'启用':'禁用'}} |
| @@ -185,13 +187,13 @@ | @@ -185,13 +187,13 @@ | ||
| 185 | <div class="tableBtn greens" @click="handleEditForm(scope.row,true)" v-if="scope.row.auditStatus =='1'"> | 187 | <div class="tableBtn greens" @click="handleEditForm(scope.row,true)" v-if="scope.row.auditStatus =='1'"> |
| 186 | 编辑 | 188 | 编辑 |
| 187 | </div> | 189 | </div> |
| 188 | - <div class="tableBtn greens" v-if="scope.row.auditStatus =='1'" @click="peizhi(scope.row)"> | 190 | + <div class="tableBtn greens" v-if="scope.row.auditStatus =='1' &&this.$btnFlax" @click="peizhi(scope.row)"> |
| 189 | 审核流程配置 | 191 | 审核流程配置 |
| 190 | </div> | 192 | </div> |
| 191 | - <div class="tableBtn greens" v-if="scope.row.enableStatus== 1 || scope.row.enableStatus == null &&scope.row.auditStatus =='2'" @click="qiyong(scope.row,0)"> | 193 | + <div class="tableBtn greens" v-if="scope.row.enableStatus== 1 || scope.row.enableStatus == null &&scope.row.auditStatus =='2' && this.$btnFlax" @click="qiyong(scope.row,0)"> |
| 192 | 启用 | 194 | 启用 |
| 193 | </div> | 195 | </div> |
| 194 | - <div class="tableBtn greens" v-if="scope.row.enableStatus == 0 &&scope.row.auditStatus =='2' " @click="qiyong(scope.row,1)"> | 196 | + <div class="tableBtn greens" v-if="scope.row.enableStatus == 0 &&scope.row.auditStatus =='2' &&this.$btnFlax" @click="qiyong(scope.row,1)"> |
| 195 | 禁用 | 197 | 禁用 |
| 196 | </div> | 198 | </div> |
| 197 | <div class="tableBtn greens" @click="delGuan(scope.row)" > | 199 | <div class="tableBtn greens" @click="delGuan(scope.row)" > |
yanshouban/src/views/advertisement/index.vue
| @@ -1097,10 +1097,11 @@ | @@ -1097,10 +1097,11 @@ | ||
| 1097 | this.hetong.lessorName =this.$decrypt(this.hetong.lessorName) | 1097 | this.hetong.lessorName =this.$decrypt(this.hetong.lessorName) |
| 1098 | this.hetong.telephone =this.$decrypt(this.hetong.telephone) | 1098 | this.hetong.telephone =this.$decrypt(this.hetong.telephone) |
| 1099 | this.hetong.tenantName =this.$decrypt(this.hetong.tenantName) | 1099 | this.hetong.tenantName =this.$decrypt(this.hetong.tenantName) |
| 1100 | - | 1100 | + this.hetong.tenantBankAccount =this.$decrypt(this.hetong.tenantBankAccount) |
| 1101 | + this.hetong.tenantTelephone =this.$decrypt(this.hetong.tenantTelephone) | ||
| 1101 | } | 1102 | } |
| 1102 | this.hetongBox = true | 1103 | this.hetongBox = true |
| 1103 | - console.log(this.hetong) | 1104 | + |
| 1104 | }, | 1105 | }, |
| 1105 | //编辑合同 | 1106 | //编辑合同 |
| 1106 | async EditHetong(val){ | 1107 | async EditHetong(val){ |
yanshouban/src/views/atmosphere/atmosphereGl.vue
| @@ -97,7 +97,7 @@ | @@ -97,7 +97,7 @@ | ||
| 97 | <el-table-column prop="auditReminderTime" label="审核提醒时间" width="200"> | 97 | <el-table-column prop="auditReminderTime" label="审核提醒时间" width="200"> |
| 98 | 98 | ||
| 99 | </el-table-column> | 99 | </el-table-column> |
| 100 | - <el-table-column label="操作" width="350"> | 100 | + <el-table-column label="操作" width="350" fixed="right"> |
| 101 | <template slot-scope="scope"> | 101 | <template slot-scope="scope"> |
| 102 | <div class="tableBtn greens" @click="actBian(scope.row)" v-if="scope.row.state == ''">修改</div> | 102 | <div class="tableBtn greens" @click="actBian(scope.row)" v-if="scope.row.state == ''">修改</div> |
| 103 | <!-- <div class="tableBtn greens">发布</div> --> | 103 | <!-- <div class="tableBtn greens">发布</div> --> |
yanshouban/src/views/detect/admap.vue
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | <el-button @click="addbuss" | 55 | <el-button @click="addbuss" |
| 56 | style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" | 56 | style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" |
| 57 | icon="el-icon-circle-plus-outline">新增</el-button> | 57 | icon="el-icon-circle-plus-outline">新增</el-button> |
| 58 | - <el-upload class="upload-demo" ref="upload" | 58 | + <!-- <el-upload class="upload-demo" ref="upload" |
| 59 | :limit="1" | 59 | :limit="1" |
| 60 | accept=".xlsx" | 60 | accept=".xlsx" |
| 61 | :action="uploadFileUrl" | 61 | :action="uploadFileUrl" |
| @@ -64,7 +64,7 @@ | @@ -64,7 +64,7 @@ | ||
| 64 | :auto-upload="true" | 64 | :auto-upload="true" |
| 65 | :show-file-list="false"> | 65 | :show-file-list="false"> |
| 66 | <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;margin-left:15px;" class="buttonHover">导入</el-button> | 66 | <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;margin-left:15px;" class="buttonHover">导入</el-button> |
| 67 | - </el-upload> | 67 | + </el-upload> --> |
| 68 | </div> | 68 | </div> |
| 69 | <!-- 地图 --> | 69 | <!-- 地图 --> |
| 70 | <div style="display: flex;justify-content: space-between;margin-bottom: 20px;"> | 70 | <div style="display: flex;justify-content: space-between;margin-bottom: 20px;"> |
| @@ -128,11 +128,6 @@ | @@ -128,11 +128,6 @@ | ||
| 128 | {{scope.$index +1}} | 128 | {{scope.$index +1}} |
| 129 | </template> | 129 | </template> |
| 130 | </el-table-column> | 130 | </el-table-column> |
| 131 | - <el-table-column label="编号" prop="venueNumber" min-width="200"> | ||
| 132 | - </el-table-column> | ||
| 133 | - <el-table-column label="门牌号" prop="houseNumber" min-width="150"> | ||
| 134 | - | ||
| 135 | - </el-table-column> | ||
| 136 | <el-table-column label="商铺名称" prop="shopName" min-width="150"> | 131 | <el-table-column label="商铺名称" prop="shopName" min-width="150"> |
| 137 | 132 | ||
| 138 | </el-table-column> | 133 | </el-table-column> |
| @@ -142,10 +137,10 @@ | @@ -142,10 +137,10 @@ | ||
| 142 | </el-table-column> | 137 | </el-table-column> |
| 143 | <el-table-column prop="detailedLocation" label="详细地址" min-width="300"> | 138 | <el-table-column prop="detailedLocation" label="详细地址" min-width="300"> |
| 144 | </el-table-column> | 139 | </el-table-column> |
| 145 | - <el-table-column label="商户名称" prop="commercialTenantName" min-width="150"> | 140 | + <!-- <el-table-column label="商户名称" prop="commercialTenantName" min-width="150"> |
| 146 | </el-table-column> | 141 | </el-table-column> |
| 147 | <el-table-column label="商户电话" prop="commercialTenantPhone" min-width="150"> | 142 | <el-table-column label="商户电话" prop="commercialTenantPhone" min-width="150"> |
| 148 | - </el-table-column> | 143 | + </el-table-column> --> |
| 149 | <el-table-column label="实际使用面积" prop="actualUsableArea" min-width="150"> | 144 | <el-table-column label="实际使用面积" prop="actualUsableArea" min-width="150"> |
| 150 | </el-table-column> | 145 | </el-table-column> |
| 151 | <el-table-column label="归属部门" prop="belongingDepartment" min-width="150"> | 146 | <el-table-column label="归属部门" prop="belongingDepartment" min-width="150"> |
| @@ -189,18 +184,17 @@ | @@ -189,18 +184,17 @@ | ||
| 189 | </el-table-column> | 184 | </el-table-column> |
| 190 | <el-table-column label="广告位类型" prop="advertisingType" min-width="150" v-if="activeName == 'second'"> | 185 | <el-table-column label="广告位类型" prop="advertisingType" min-width="150" v-if="activeName == 'second'"> |
| 191 | </el-table-column> | 186 | </el-table-column> |
| 192 | - <el-table-column label="详细地址" prop="detailedLocation" min-width="200" v-if="activeName == 'second'"> | 187 | + <!-- <el-table-column label="详细地址" prop="detailedLocation" min-width="200" v-if="activeName == 'second'"> |
| 193 | </el-table-column> | 188 | </el-table-column> |
| 194 | <el-table-column label="设备类型" prop="deviceType" min-width="150" v-if="activeName == 'second'"> | 189 | <el-table-column label="设备类型" prop="deviceType" min-width="150" v-if="activeName == 'second'"> |
| 195 | </el-table-column> | 190 | </el-table-column> |
| 196 | <el-table-column label="设备尺寸" prop="equipmentSize" min-width="200" v-if="activeName == 'second'"> | 191 | <el-table-column label="设备尺寸" prop="equipmentSize" min-width="200" v-if="activeName == 'second'"> |
| 197 | </el-table-column> | 192 | </el-table-column> |
| 198 | - <el-table-column label="广告位编号" prop="advertisingSpaceNumber" min-width="150" v-if="activeName == 'second'"> | ||
| 199 | - </el-table-column> | 193 | + |
| 200 | <el-table-column label="广告尺寸" prop="dimensions" min-width="200" v-if="activeName == 'second'"> | 194 | <el-table-column label="广告尺寸" prop="dimensions" min-width="200" v-if="activeName == 'second'"> |
| 201 | </el-table-column> | 195 | </el-table-column> |
| 202 | <el-table-column label="广告材质" prop="advertisingMaterial" min-width="150" v-if="activeName == 'second'"> | 196 | <el-table-column label="广告材质" prop="advertisingMaterial" min-width="150" v-if="activeName == 'second'"> |
| 203 | - </el-table-column> | 197 | + </el-table-column> --> |
| 204 | <!-- <el-table-column prop="createUser" label="创建人" min-width="120" v-if="activeName == 'second'"> | 198 | <!-- <el-table-column prop="createUser" label="创建人" min-width="120" v-if="activeName == 'second'"> |
| 205 | </el-table-column> --> | 199 | </el-table-column> --> |
| 206 | <el-table-column prop="rentalStatus" label="租赁状态" min-width="120" v-if="activeName == 'second'"> | 200 | <el-table-column prop="rentalStatus" label="租赁状态" min-width="120" v-if="activeName == 'second'"> |
| @@ -236,13 +230,11 @@ | @@ -236,13 +230,11 @@ | ||
| 236 | {{scope.$index +1}} | 230 | {{scope.$index +1}} |
| 237 | </template> | 231 | </template> |
| 238 | </el-table-column> | 232 | </el-table-column> |
| 239 | - <!-- <el-table-column label="编号" min-width="6%" prop="id" v-if="activeName == 'second'"> | ||
| 240 | - </el-table-column> --> | ||
| 241 | <el-table-column label="场地名称" min-width="6%" prop="venueName" v-if="activeName == 'third'"> | 233 | <el-table-column label="场地名称" min-width="6%" prop="venueName" v-if="activeName == 'third'"> |
| 242 | </el-table-column> | 234 | </el-table-column> |
| 243 | <el-table-column label="实际使用面积" min-width="6%" prop="actualArea" v-if="activeName == 'third'"> | 235 | <el-table-column label="实际使用面积" min-width="6%" prop="actualArea" v-if="activeName == 'third'"> |
| 244 | </el-table-column> | 236 | </el-table-column> |
| 245 | - <el-table-column label="场地编号" prop="venueSpaceNumber" min-width="10%" v-if="activeName == 'third'" /> | 237 | + |
| 246 | <el-table-column label="场地类型" min-width="6%" prop="venueType" v-if="activeName == 'third'"> | 238 | <el-table-column label="场地类型" min-width="6%" prop="venueType" v-if="activeName == 'third'"> |
| 247 | </el-table-column> | 239 | </el-table-column> |
| 248 | <el-table-column label="所属区域" min-width="6%" prop="district" v-if="activeName == 'third'"> | 240 | <el-table-column label="所属区域" min-width="6%" prop="district" v-if="activeName == 'third'"> |
| @@ -1127,6 +1119,10 @@ | @@ -1127,6 +1119,10 @@ | ||
| 1127 | <el-form-item label="商铺业态" prop="commercialForm"> | 1119 | <el-form-item label="商铺业态" prop="commercialForm"> |
| 1128 | <div v-if="edit" class="duiqi">{{editbgid.commercialForm}}</div> | 1120 | <div v-if="edit" class="duiqi">{{editbgid.commercialForm}}</div> |
| 1129 | <el-select v-model="editbgid.commercialForm" placeholder="请选择" style="margin-top:5px;width: 100%;" v-else> | 1121 | <el-select v-model="editbgid.commercialForm" placeholder="请选择" style="margin-top:5px;width: 100%;" v-else> |
| 1122 | + <el-option label="零售业态" value="零售业态"></el-option> | ||
| 1123 | + <el-option label="餐饮业态" value="餐饮业态"></el-option> | ||
| 1124 | + <el-option label="服务业态" value="服务业态"></el-option> | ||
| 1125 | + <el-option label="娱乐业态" value="娱乐业态"></el-option> | ||
| 1130 | <el-option label="商超" value="商超"></el-option> | 1126 | <el-option label="商超" value="商超"></el-option> |
| 1131 | </el-select> | 1127 | </el-select> |
| 1132 | </el-input> | 1128 | </el-input> |
yanshouban/src/views/detect/information.vue
| @@ -64,11 +64,11 @@ | @@ -64,11 +64,11 @@ | ||
| 64 | {{scope.$index +1 }} | 64 | {{scope.$index +1 }} |
| 65 | </template> | 65 | </template> |
| 66 | </el-table-column> | 66 | </el-table-column> |
| 67 | - <el-table-column label="编号" prop="venueNumber" min-width="200" show-overflow-tooltip> | ||
| 68 | - </el-table-column> | ||
| 69 | - <el-table-column label="门牌号" prop="houseNumber" min-width="80" show-overflow-tooltip> | 67 | + <!-- <el-table-column label="编号" prop="venueNumber" min-width="200" show-overflow-tooltip> |
| 68 | + </el-table-column> --> | ||
| 69 | + <!-- <el-table-column label="门牌号" prop="houseNumber" min-width="80" show-overflow-tooltip> | ||
| 70 | 70 | ||
| 71 | - </el-table-column> | 71 | + </el-table-column> --> |
| 72 | <el-table-column label="商铺名称" prop="shopName" min-width="250" show-overflow-tooltip> | 72 | <el-table-column label="商铺名称" prop="shopName" min-width="250" show-overflow-tooltip> |
| 73 | 73 | ||
| 74 | </el-table-column> | 74 | </el-table-column> |
| @@ -135,21 +135,19 @@ | @@ -135,21 +135,19 @@ | ||
| 135 | </el-form-item> | 135 | </el-form-item> |
| 136 | </el-col> | 136 | </el-col> |
| 137 | <el-col :span="12"> | 137 | <el-col :span="12"> |
| 138 | - <el-form-item label="场地编号" prop="venueNumber"> | 138 | + <el-form-item label="门牌号" prop="houseNumber"> |
| 139 | + <el-input v-model="ruleForm.houseNumber" placeholder="请输入" style="margin-top:5px;" | ||
| 140 | + maxlength="20"></el-input> | ||
| 141 | + </el-form-item> | ||
| 142 | + <!-- <el-form-item label="场地编号" prop="venueNumber"> | ||
| 139 | <el-input v-model="ruleForm.venueNumber" disabled placeholder="将根据类型自动为资源编号" | 143 | <el-input v-model="ruleForm.venueNumber" disabled placeholder="将根据类型自动为资源编号" |
| 140 | style="margin-top:5px;"></el-input> | 144 | style="margin-top:5px;"></el-input> |
| 141 | - </el-form-item> | 145 | + </el-form-item> --> |
| 142 | </el-col> | 146 | </el-col> |
| 143 | 147 | ||
| 144 | </el-row> | 148 | </el-row> |
| 145 | <el-row :gutter="20"> | 149 | <el-row :gutter="20"> |
| 146 | <el-col :span="12"> | 150 | <el-col :span="12"> |
| 147 | - <el-form-item label="门牌号" prop="houseNumber"> | ||
| 148 | - <el-input v-model="ruleForm.houseNumber" placeholder="请输入" style="margin-top:5px;" | ||
| 149 | - maxlength="20"></el-input> | ||
| 150 | - </el-form-item> | ||
| 151 | - </el-col> | ||
| 152 | - <el-col :span="12"> | ||
| 153 | <el-form-item label="建筑形式" prop="architecturalForm"> | 151 | <el-form-item label="建筑形式" prop="architecturalForm"> |
| 154 | <el-select v-model="ruleForm.architecturalForm" placeholder="请选择" style="margin-top:5px;width: 100%;"> | 152 | <el-select v-model="ruleForm.architecturalForm" placeholder="请选择" style="margin-top:5px;width: 100%;"> |
| 155 | <el-option label="框剪结构" value="框剪结构"></el-option> | 153 | <el-option label="框剪结构" value="框剪结构"></el-option> |
| @@ -157,6 +155,21 @@ | @@ -157,6 +155,21 @@ | ||
| 157 | </el-select> | 155 | </el-select> |
| 158 | </el-form-item> | 156 | </el-form-item> |
| 159 | </el-col> | 157 | </el-col> |
| 158 | + <el-col :span="12"> | ||
| 159 | + <el-form-item label="所属区域" prop="belongingRegion"> | ||
| 160 | + <el-select v-model="ruleForm.belongingRegion" placeholder="请选择" style="margin-top:5px;width: 100%;"> | ||
| 161 | + <el-option label="成华区" value="成华区"></el-option> | ||
| 162 | + <el-option label="武侯区" value="武侯区"></el-option> | ||
| 163 | + <el-option label="锦江区" value="锦江区"></el-option> | ||
| 164 | + <el-option label="青羊区" value="青羊区"></el-option> | ||
| 165 | + <el-option label="金牛区" value="金牛区"></el-option> | ||
| 166 | + <el-option label="双流区" value="双流区"></el-option> | ||
| 167 | + <el-option label="郫都区" value="郫都区"></el-option> | ||
| 168 | + <el-option label="龙泉驿区" value="龙泉驿区"></el-option> | ||
| 169 | + <el-option label="温江区" value="温江区"></el-option> | ||
| 170 | + </el-select> | ||
| 171 | + </el-form-item> | ||
| 172 | + </el-col> | ||
| 160 | </el-row> | 173 | </el-row> |
| 161 | 174 | ||
| 162 | <el-row :gutter="20"> | 175 | <el-row :gutter="20"> |
| @@ -199,36 +212,21 @@ | @@ -199,36 +212,21 @@ | ||
| 199 | 212 | ||
| 200 | <el-row :gutter="20"> | 213 | <el-row :gutter="20"> |
| 201 | <el-col :span="12"> | 214 | <el-col :span="12"> |
| 202 | - <el-form-item label="所属区域" prop="belongingRegion"> | ||
| 203 | - <el-select v-model="ruleForm.belongingRegion" placeholder="请选择" style="margin-top:5px;width: 100%;"> | ||
| 204 | - <el-option label="成华区" value="成华区"></el-option> | ||
| 205 | - <el-option label="武侯区" value="武侯区"></el-option> | ||
| 206 | - <el-option label="锦江区" value="锦江区"></el-option> | ||
| 207 | - <el-option label="青羊区" value="青羊区"></el-option> | ||
| 208 | - <el-option label="金牛区" value="金牛区"></el-option> | ||
| 209 | - <el-option label="双流区" value="双流区"></el-option> | ||
| 210 | - <el-option label="郫都区" value="郫都区"></el-option> | ||
| 211 | - <el-option label="龙泉驿区" value="龙泉驿区"></el-option> | ||
| 212 | - <el-option label="温江区" value="温江区"></el-option> | ||
| 213 | - </el-select> | ||
| 214 | - </el-form-item> | ||
| 215 | - </el-col> | ||
| 216 | - <el-col :span="12"> | ||
| 217 | <el-form-item label="归属部门" prop="belongingDepartment"> | 215 | <el-form-item label="归属部门" prop="belongingDepartment"> |
| 218 | <el-input v-model="ruleForm.belongingDepartment" placeholder="请输入" style="margin-top:5px;" | 216 | <el-input v-model="ruleForm.belongingDepartment" placeholder="请输入" style="margin-top:5px;" |
| 219 | maxlength="50"> | 217 | maxlength="50"> |
| 220 | </el-input> | 218 | </el-input> |
| 221 | </el-form-item> | 219 | </el-form-item> |
| 222 | </el-col> | 220 | </el-col> |
| 223 | - </el-row> | ||
| 224 | - | ||
| 225 | - <el-row :gutter="20"> | ||
| 226 | <el-col :span="12"> | 221 | <el-col :span="12"> |
| 227 | <el-form-item label="负责人" prop="head"> | 222 | <el-form-item label="负责人" prop="head"> |
| 228 | <el-input v-model="ruleForm.head" placeholder="请输入" style="margin-top:5px;" maxlength="20"> | 223 | <el-input v-model="ruleForm.head" placeholder="请输入" style="margin-top:5px;" maxlength="20"> |
| 229 | </el-input> | 224 | </el-input> |
| 230 | </el-form-item> | 225 | </el-form-item> |
| 231 | </el-col> | 226 | </el-col> |
| 227 | + </el-row> | ||
| 228 | + | ||
| 229 | + <el-row :gutter="20"> | ||
| 232 | <el-col :span="12"> | 230 | <el-col :span="12"> |
| 233 | <el-form-item label="详细位置" prop="detailedLocation"> | 231 | <el-form-item label="详细位置" prop="detailedLocation"> |
| 234 | <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" style="margin-top:5px;" | 232 | <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" style="margin-top:5px;" |
| @@ -236,16 +234,17 @@ | @@ -236,16 +234,17 @@ | ||
| 236 | </el-input> | 234 | </el-input> |
| 237 | </el-form-item> | 235 | </el-form-item> |
| 238 | </el-col> | 236 | </el-col> |
| 239 | - </el-row> | ||
| 240 | - <el-row :gutter="20"> | ||
| 241 | <el-col :span="12"> | 237 | <el-col :span="12"> |
| 242 | <el-form-item label="商铺业态" prop="commercialForm"> | 238 | <el-form-item label="商铺业态" prop="commercialForm"> |
| 243 | <el-select v-model="ruleForm.commercialForm" placeholder="请选择" style="margin-top:5px;width: 100%;"> | 239 | <el-select v-model="ruleForm.commercialForm" placeholder="请选择" style="margin-top:5px;width: 100%;"> |
| 240 | + <el-option label="零售业态" value="零售业态"></el-option> | ||
| 241 | + <el-option label="餐饮业态" value="餐饮业态"></el-option> | ||
| 242 | + <el-option label="服务业态" value="服务业态"></el-option> | ||
| 243 | + <el-option label="娱乐业态" value="娱乐业态"></el-option> | ||
| 244 | <el-option label="商超" value="商超"></el-option> | 244 | <el-option label="商超" value="商超"></el-option> |
| 245 | </el-select> | 245 | </el-select> |
| 246 | </el-form-item> | 246 | </el-form-item> |
| 247 | </el-col> | 247 | </el-col> |
| 248 | - | ||
| 249 | </el-row> | 248 | </el-row> |
| 250 | <el-row :gutter="20"> | 249 | <el-row :gutter="20"> |
| 251 | <el-col :span="24"> | 250 | <el-col :span="24"> |
| @@ -336,19 +335,17 @@ | @@ -336,19 +335,17 @@ | ||
| 336 | </el-form-item> | 335 | </el-form-item> |
| 337 | </el-col> | 336 | </el-col> |
| 338 | <el-col :span="12"> | 337 | <el-col :span="12"> |
| 339 | - <el-form-item label="场地编号" prop="venueNumber"> | ||
| 340 | - <div class="duiqi">{{editbgid.venueNumber}}</div> | ||
| 341 | - </el-form-item> | ||
| 342 | - </el-col> | ||
| 343 | - </el-row> | ||
| 344 | - <el-row :gutter="20"> | ||
| 345 | - <el-col :span="12"> | ||
| 346 | <el-form-item label="门牌号" prop="houseNumber"> | 338 | <el-form-item label="门牌号" prop="houseNumber"> |
| 347 | <div v-if="edit" class="duiqi">{{editbgid.houseNumber}}</div> | 339 | <div v-if="edit" class="duiqi">{{editbgid.houseNumber}}</div> |
| 348 | <el-input v-model="editbgid.houseNumber" placeholder="请输入" style="margin-top: 5px;" maxlength="50" | 340 | <el-input v-model="editbgid.houseNumber" placeholder="请输入" style="margin-top: 5px;" maxlength="50" |
| 349 | v-else></el-input> | 341 | v-else></el-input> |
| 350 | </el-form-item> | 342 | </el-form-item> |
| 343 | + <!-- <el-form-item label="场地编号" prop="venueNumber"> | ||
| 344 | + <div class="duiqi">{{editbgid.venueNumber}}</div> | ||
| 345 | + </el-form-item> --> | ||
| 351 | </el-col> | 346 | </el-col> |
| 347 | + </el-row> | ||
| 348 | + <el-row :gutter="20"> | ||
| 352 | <el-col :span="12"> | 349 | <el-col :span="12"> |
| 353 | <el-form-item label="建筑形式" prop="architecturalForm"> | 350 | <el-form-item label="建筑形式" prop="architecturalForm"> |
| 354 | <div v-if="edit" class="duiqi">{{editbgid.architecturalForm}}</div> | 351 | <div v-if="edit" class="duiqi">{{editbgid.architecturalForm}}</div> |
| @@ -359,6 +356,23 @@ | @@ -359,6 +356,23 @@ | ||
| 359 | </el-select> | 356 | </el-select> |
| 360 | </el-form-item> | 357 | </el-form-item> |
| 361 | </el-col> | 358 | </el-col> |
| 359 | + <el-col :span="12"> | ||
| 360 | + <el-form-item label="所属区域" prop="belongingRegion"> | ||
| 361 | + <div v-if="edit" class="duiqi">{{editbgid.belongingRegion}}</div> | ||
| 362 | + <el-select v-model="editbgid.belongingRegion" placeholder="请选择" style="margin-top:5px;width: 100%;" | ||
| 363 | + v-else> | ||
| 364 | + <el-option label="成华区" value="成华区"></el-option> | ||
| 365 | + <el-option label="武侯区" value="武侯区"></el-option> | ||
| 366 | + <el-option label="锦江区" value="锦江区"></el-option> | ||
| 367 | + <el-option label="青羊区" value="青羊区"></el-option> | ||
| 368 | + <el-option label="金牛区" value="金牛区"></el-option> | ||
| 369 | + <el-option label="双流区" value="双流区"></el-option> | ||
| 370 | + <el-option label="郫都区" value="郫都区"></el-option> | ||
| 371 | + <el-option label="龙泉驿区" value="龙泉驿区"></el-option> | ||
| 372 | + <el-option label="温江区" value="温江区"></el-option> | ||
| 373 | + </el-select> | ||
| 374 | + </el-form-item> | ||
| 375 | + </el-col> | ||
| 362 | </el-row> | 376 | </el-row> |
| 363 | <el-row :gutter="20"> | 377 | <el-row :gutter="20"> |
| 364 | <el-col :span="12"> | 378 | <el-col :span="12"> |
| @@ -404,31 +418,11 @@ | @@ -404,31 +418,11 @@ | ||
| 404 | </el-row> | 418 | </el-row> |
| 405 | <el-row :gutter="20"> | 419 | <el-row :gutter="20"> |
| 406 | <el-col :span="12"> | 420 | <el-col :span="12"> |
| 407 | - <el-form-item label="所属区域" prop="belongingRegion"> | ||
| 408 | - <div v-if="edit" class="duiqi">{{editbgid.belongingRegion}}</div> | ||
| 409 | - <el-select v-model="editbgid.belongingRegion" placeholder="请选择" style="margin-top:5px;width: 100%;" | ||
| 410 | - v-else> | ||
| 411 | - <el-option label="成华区" value="成华区"></el-option> | ||
| 412 | - <el-option label="武侯区" value="武侯区"></el-option> | ||
| 413 | - <el-option label="锦江区" value="锦江区"></el-option> | ||
| 414 | - <el-option label="青羊区" value="青羊区"></el-option> | ||
| 415 | - <el-option label="金牛区" value="金牛区"></el-option> | ||
| 416 | - <el-option label="双流区" value="双流区"></el-option> | ||
| 417 | - <el-option label="郫都区" value="郫都区"></el-option> | ||
| 418 | - <el-option label="龙泉驿区" value="龙泉驿区"></el-option> | ||
| 419 | - <el-option label="温江区" value="温江区"></el-option> | ||
| 420 | - </el-select> | ||
| 421 | - </el-form-item> | ||
| 422 | - </el-col> | ||
| 423 | - <el-col :span="12"> | ||
| 424 | <el-form-item label="归属部门" prop="belongingDepartment"> | 421 | <el-form-item label="归属部门" prop="belongingDepartment"> |
| 425 | <div v-if="edit" class="duiqi">{{editbgid.belongingDepartment}}</div> | 422 | <div v-if="edit" class="duiqi">{{editbgid.belongingDepartment}}</div> |
| 426 | <el-input v-model="editbgid.belongingDepartment" placeholder="请输入" style="margin-top:5px;" v-else /> | 423 | <el-input v-model="editbgid.belongingDepartment" placeholder="请输入" style="margin-top:5px;" v-else /> |
| 427 | </el-form-item> | 424 | </el-form-item> |
| 428 | </el-col> | 425 | </el-col> |
| 429 | - </el-row> | ||
| 430 | - | ||
| 431 | - <el-row :gutter="20"> | ||
| 432 | <el-col :span="12"> | 426 | <el-col :span="12"> |
| 433 | <el-form-item label="负责人" prop="head"> | 427 | <el-form-item label="负责人" prop="head"> |
| 434 | <div v-if="edit" class="duiqi">{{editbgid.head}}</div> | 428 | <div v-if="edit" class="duiqi">{{editbgid.head}}</div> |
| @@ -436,6 +430,9 @@ | @@ -436,6 +430,9 @@ | ||
| 436 | </el-input> | 430 | </el-input> |
| 437 | </el-form-item> | 431 | </el-form-item> |
| 438 | </el-col> | 432 | </el-col> |
| 433 | + </el-row> | ||
| 434 | + | ||
| 435 | + <el-row :gutter="20"> | ||
| 439 | <el-col :span="12"> | 436 | <el-col :span="12"> |
| 440 | <el-form-item label="详细位置" prop="detailedLocation"> | 437 | <el-form-item label="详细位置" prop="detailedLocation"> |
| 441 | <div v-if="edit" class="duiqi">{{editbgid.detailedLocation}}</div> | 438 | <div v-if="edit" class="duiqi">{{editbgid.detailedLocation}}</div> |
| @@ -443,20 +440,20 @@ | @@ -443,20 +440,20 @@ | ||
| 443 | maxlength="100" /> | 440 | maxlength="100" /> |
| 444 | </el-form-item> | 441 | </el-form-item> |
| 445 | </el-col> | 442 | </el-col> |
| 446 | - </el-row> | ||
| 447 | -<el-row :gutter="20"> | ||
| 448 | <el-col :span="12"> | 443 | <el-col :span="12"> |
| 449 | <el-form-item label="商铺业态" prop="commercialForm"> | 444 | <el-form-item label="商铺业态" prop="commercialForm"> |
| 450 | <div v-if="edit" class="duiqi">{{editbgid.commercialForm}}</div> | 445 | <div v-if="edit" class="duiqi">{{editbgid.commercialForm}}</div> |
| 451 | <el-select v-model="ruleForm.commercialForm" placeholder="请选择" style="margin-top:5px;width: 100%;" v-else> | 446 | <el-select v-model="ruleForm.commercialForm" placeholder="请选择" style="margin-top:5px;width: 100%;" v-else> |
| 447 | + <el-option label="零售业态" value="零售业态"></el-option> | ||
| 448 | + <el-option label="餐饮业态" value="餐饮业态"></el-option> | ||
| 449 | + <el-option label="服务业态" value="服务业态"></el-option> | ||
| 450 | + <el-option label="娱乐业态" value="娱乐业态"></el-option> | ||
| 452 | <el-option label="商超" value="商超"></el-option> | 451 | <el-option label="商超" value="商超"></el-option> |
| 453 | </el-select> | 452 | </el-select> |
| 454 | </el-input> | 453 | </el-input> |
| 455 | </el-form-item> | 454 | </el-form-item> |
| 456 | </el-col> | 455 | </el-col> |
| 457 | - | ||
| 458 | </el-row> | 456 | </el-row> |
| 459 | - | ||
| 460 | <el-row :gutter="20"> | 457 | <el-row :gutter="20"> |
| 461 | <el-col :span="24"> | 458 | <el-col :span="24"> |
| 462 | <el-form-item label="地图标点" prop="mapPunctuation"> | 459 | <el-form-item label="地图标点" prop="mapPunctuation"> |
| @@ -672,11 +669,6 @@ | @@ -672,11 +669,6 @@ | ||
| 672 | message: '请输入商铺名称', | 669 | message: '请输入商铺名称', |
| 673 | trigger: 'blur' | 670 | trigger: 'blur' |
| 674 | }, ], | 671 | }, ], |
| 675 | - houseNumber: [{ | ||
| 676 | - required: true, | ||
| 677 | - message: '请输入门牌号', | ||
| 678 | - trigger: 'blur' | ||
| 679 | - }, ], | ||
| 680 | architecturalForm: [{ | 672 | architecturalForm: [{ |
| 681 | required: true, | 673 | required: true, |
| 682 | message: '请选择建筑形式', | 674 | message: '请选择建筑形式', |
yanshouban/src/views/detect/map.vue
| @@ -16,18 +16,32 @@ | @@ -16,18 +16,32 @@ | ||
| 16 | <!-- 搜索 --> | 16 | <!-- 搜索 --> |
| 17 | <div class="formSearch"> | 17 | <div class="formSearch"> |
| 18 | <el-form :inline="true" :model="formSel"> | 18 | <el-form :inline="true" :model="formSel"> |
| 19 | + <el-form-item label="广告位名称" prop="advertisingName" > | ||
| 20 | + <el-input v-model="formSel.advertisingName" placeholder="请输入" style="width: 168px;margin-right: 15px" | ||
| 21 | + maxlength="200"></el-input> | ||
| 22 | + </el-form-item> | ||
| 19 | <el-form-item label="所属端" prop="affiliation" v-if="leixing"> | 23 | <el-form-item label="所属端" prop="affiliation" v-if="leixing"> |
| 20 | <el-select v-model="formSel.affiliation" placeholder="请选择" style="width: 168px;margin-right: 15px"> | 24 | <el-select v-model="formSel.affiliation" placeholder="请选择" style="width: 168px;margin-right: 15px"> |
| 21 | <el-option label="游客小程序" value="游客小程序" /> | 25 | <el-option label="游客小程序" value="游客小程序" /> |
| 22 | <el-option label="商家客户端" value="商家客户端" /> | 26 | <el-option label="商家客户端" value="商家客户端" /> |
| 23 | </el-select> | 27 | </el-select> |
| 24 | </el-form-item> | 28 | </el-form-item> |
| 29 | + <el-form-item label="轮播顺序" prop="rotationOrder" v-if="leixing"> | ||
| 30 | + <el-select v-model="formSel.rotationOrder" placeholder="请选择" style="width: 168px;margin-right: 15px"> | ||
| 31 | + <el-option label="1" value="1" /> | ||
| 32 | + <el-option label="2" value="2" /> | ||
| 33 | + </el-select> | ||
| 34 | + </el-form-item> | ||
| 25 | <el-form-item label="设备类型" prop="deviceType" v-if="leixing == false"> | 35 | <el-form-item label="设备类型" prop="deviceType" v-if="leixing == false"> |
| 26 | <el-input v-model="formSel.deviceType" placeholder="请输入" style="width: 168px;margin-right: 15px" | 36 | <el-input v-model="formSel.deviceType" placeholder="请输入" style="width: 168px;margin-right: 15px" |
| 27 | maxlength="200"></el-input> | 37 | maxlength="200"></el-input> |
| 28 | 38 | ||
| 29 | </el-form-item> | 39 | </el-form-item> |
| 40 | + <el-form-item label="广告材质" prop="advertisingMaterial" v-if="leixing == false"> | ||
| 41 | + <el-input v-model="formSel.advertisingMaterial" placeholder="请输入" style="width: 168px;margin-right: 15px" | ||
| 42 | + maxlength="200"></el-input> | ||
| 30 | 43 | ||
| 44 | + </el-form-item> | ||
| 31 | <!-- <el-form-item label="创建时间" prop="createDate"> | 45 | <!-- <el-form-item label="创建时间" prop="createDate"> |
| 32 | <el-select v-model="formSel.createDate" placeholder="请选择" | 46 | <el-select v-model="formSel.createDate" placeholder="请选择" |
| 33 | style="width: 168px;margin-right: 15px"> | 47 | style="width: 168px;margin-right: 15px"> |
| @@ -71,8 +85,8 @@ | @@ -71,8 +85,8 @@ | ||
| 71 | </el-table-column> | 85 | </el-table-column> |
| 72 | <el-table-column label="设备大小" prop="equipmentSize" min-width="200" v-if="leixing == false"> | 86 | <el-table-column label="设备大小" prop="equipmentSize" min-width="200" v-if="leixing == false"> |
| 73 | </el-table-column> | 87 | </el-table-column> |
| 74 | - <el-table-column label="广告位编号" prop="advertisingSpaceNumber" min-width="120" v-if="leixing == false" show-overflow-tooltip> | ||
| 75 | - </el-table-column> | 88 | + <!-- <el-table-column label="广告位编号" prop="advertisingSpaceNumber" min-width="120" v-if="leixing == false" show-overflow-tooltip> |
| 89 | + </el-table-column> --> | ||
| 76 | <el-table-column label="轮播顺序" prop="rotationOrder" min-width="80" v-if="leixing"> | 90 | <el-table-column label="轮播顺序" prop="rotationOrder" min-width="80" v-if="leixing"> |
| 77 | 91 | ||
| 78 | </el-table-column> | 92 | </el-table-column> |
| @@ -137,10 +151,19 @@ | @@ -137,10 +151,19 @@ | ||
| 137 | </el-form-item> | 151 | </el-form-item> |
| 138 | </el-col> | 152 | </el-col> |
| 139 | <el-col :span="12"> | 153 | <el-col :span="12"> |
| 140 | - <el-form-item label="广告位编号" prop="advertisingSpaceNumber"> | 154 | + <el-form-item label="可上传大小" prop="size" v-if='leixing'> |
| 155 | + <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input> | ||
| 156 | + </el-form-item> | ||
| 157 | + <el-form-item label="广告材质" prop="advertisingMaterial" v-if='leixing == false'> | ||
| 158 | + <div style="display: flex;justify-content: space-between;"> | ||
| 159 | + <el-input v-model="formInline.advertisingMaterial" style="margin-top:5px;" placeholder="请输入" | ||
| 160 | + maxlength="200" ></el-input> | ||
| 161 | + </div> | ||
| 162 | + </el-form-item> | ||
| 163 | + <!-- <el-form-item label="广告位编号" prop="advertisingSpaceNumber"> | ||
| 141 | <el-input v-model="formInline.advertisingSpaceNumber" disabled placeholder="将根据类型自动为资源编号" | 164 | <el-input v-model="formInline.advertisingSpaceNumber" disabled placeholder="将根据类型自动为资源编号" |
| 142 | style="margin-top:5px;"></el-input> | 165 | style="margin-top:5px;"></el-input> |
| 143 | - </el-form-item> | 166 | + </el-form-item> --> |
| 144 | </el-col> | 167 | </el-col> |
| 145 | 168 | ||
| 146 | </el-row> | 169 | </el-row> |
| @@ -214,9 +237,7 @@ | @@ -214,9 +237,7 @@ | ||
| 214 | </el-row> | 237 | </el-row> |
| 215 | <el-row :gutter="20"> | 238 | <el-row :gutter="20"> |
| 216 | <el-col :span="12"> | 239 | <el-col :span="12"> |
| 217 | - <el-form-item label="可上传大小" prop="size" v-if='leixing'> | ||
| 218 | - <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input> | ||
| 219 | - </el-form-item> | 240 | + |
| 220 | <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'> | 241 | <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'> |
| 221 | <div style="display: flex;justify-content: space-between;"> | 242 | <div style="display: flex;justify-content: space-between;"> |
| 222 | <el-input v-model="formInline.deviceType" placeholder="请输入" style="margin-top:5px;" | 243 | <el-input v-model="formInline.deviceType" placeholder="请输入" style="margin-top:5px;" |
| @@ -290,19 +311,6 @@ | @@ -290,19 +311,6 @@ | ||
| 290 | </el-form-item> | 311 | </el-form-item> |
| 291 | 312 | ||
| 292 | </el-col> | 313 | </el-col> |
| 293 | - <el-col :span="12"> | ||
| 294 | - <el-form-item label="广告材质" prop="advertisingMaterial" v-if='leixing == false'> | ||
| 295 | - <div style="display: flex;justify-content: space-between;"> | ||
| 296 | - <el-input v-model="formInline.advertisingMaterial" style="margin-top:5px;" placeholder="请输入" | ||
| 297 | - maxlength="200" ></el-input> | ||
| 298 | - <!-- <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" | ||
| 299 | - style="margin-top:5px;width: 92%"> | ||
| 300 | - <el-option label="亚克力" value="亚克力"></el-option> | ||
| 301 | - <el-option label="玻璃" value="玻璃"></el-option> | ||
| 302 | - </el-select> --> | ||
| 303 | - </div> | ||
| 304 | - </el-form-item> | ||
| 305 | - </el-col> | ||
| 306 | 314 | ||
| 307 | </el-row> | 315 | </el-row> |
| 308 | 316 | ||
| @@ -357,9 +365,19 @@ | @@ -357,9 +365,19 @@ | ||
| 357 | </el-form-item> | 365 | </el-form-item> |
| 358 | </el-col> | 366 | </el-col> |
| 359 | <el-col :span="12"> | 367 | <el-col :span="12"> |
| 360 | - <el-form-item label="广告位编号" prop="advertisingSpaceNumber"> | ||
| 361 | - <div class="duiqi">{{editbgid.advertisingSpaceNumber}}</div> | 368 | + <el-form-item label="可上传大小" prop="size" v-if='leixing'> |
| 369 | + <div class="duiqi">{{editbgid.size}}</div> | ||
| 370 | + </el-form-item> | ||
| 371 | + <el-form-item label="广告材质" prop="advertisingMaterial" v-if='leixing == false'> | ||
| 372 | + <div v-if="edit" class="duiqi">{{editbgid.advertisingMaterial}}</div> | ||
| 373 | + <div style="display: flex;justify-content: space-between;" v-else> | ||
| 374 | + <el-input v-model="editbgid.advertisingMaterial" style="margin-top:5px;" | ||
| 375 | + maxlength="200" ></el-input> | ||
| 376 | + </div> | ||
| 362 | </el-form-item> | 377 | </el-form-item> |
| 378 | + <!-- <el-form-item label="广告位编号" prop="advertisingSpaceNumber"> | ||
| 379 | + <div class="duiqi">{{editbgid.advertisingSpaceNumber}}</div> | ||
| 380 | + </el-form-item> --> | ||
| 363 | </el-col> | 381 | </el-col> |
| 364 | </el-row> | 382 | </el-row> |
| 365 | <el-row :gutter="20"> | 383 | <el-row :gutter="20"> |
| @@ -417,9 +435,7 @@ | @@ -417,9 +435,7 @@ | ||
| 417 | 435 | ||
| 418 | <el-row :gutter="20"> | 436 | <el-row :gutter="20"> |
| 419 | <el-col :span="12"> | 437 | <el-col :span="12"> |
| 420 | - <el-form-item label="可上传大小" prop="size" v-if='leixing'> | ||
| 421 | - <div class="duiqi">{{editbgid.size}}</div> | ||
| 422 | - </el-form-item> | 438 | + |
| 423 | </el-col> | 439 | </el-col> |
| 424 | <el-col :span="12"> | 440 | <el-col :span="12"> |
| 425 | <el-form-item label="上传格式" prop="uploadFormat" v-if='leixing'> | 441 | <el-form-item label="上传格式" prop="uploadFormat" v-if='leixing'> |
| @@ -508,20 +524,7 @@ | @@ -508,20 +524,7 @@ | ||
| 508 | </div> --> | 524 | </div> --> |
| 509 | </el-form-item> | 525 | </el-form-item> |
| 510 | </el-col> | 526 | </el-col> |
| 511 | - <el-col :span="12"> | ||
| 512 | - <el-form-item label="广告材质" prop="advertisingMaterial" v-if='leixing == false'> | ||
| 513 | - <div v-if="edit" class="duiqi">{{editbgid.advertisingMaterial}}</div> | ||
| 514 | - <div style="display: flex;justify-content: space-between;" v-else> | ||
| 515 | - <el-input v-model="editbgid.advertisingMaterial" style="margin-top:5px;" | ||
| 516 | - maxlength="200" ></el-input> | ||
| 517 | - <!-- <el-select v-model="editbgid.advertisingMaterial" placeholder="请选择" | ||
| 518 | - style="margin-top:5px;width: 92%"> | ||
| 519 | - <el-option label="亚克力" value="亚克力"></el-option> | ||
| 520 | - <el-option label="玻璃" value="玻璃"></el-option> | ||
| 521 | - </el-select> --> | ||
| 522 | - </div> | ||
| 523 | - </el-form-item> | ||
| 524 | - </el-col> | 527 | + |
| 525 | </el-row> | 528 | </el-row> |
| 526 | 529 | ||
| 527 | <el-row :gutter="20"> | 530 | <el-row :gutter="20"> |
| @@ -734,6 +737,9 @@ | @@ -734,6 +737,9 @@ | ||
| 734 | deviceType: '', | 737 | deviceType: '', |
| 735 | createUser: '', | 738 | createUser: '', |
| 736 | createDate: '', | 739 | createDate: '', |
| 740 | + advertisingName:'', | ||
| 741 | + rotationOrder:'', | ||
| 742 | + advertisingMaterial:'', | ||
| 737 | pageNumber: 1, | 743 | pageNumber: 1, |
| 738 | pageSize: 10, | 744 | pageSize: 10, |
| 739 | advertisingType: '' | 745 | advertisingType: '' |
| @@ -820,6 +826,9 @@ | @@ -820,6 +826,9 @@ | ||
| 820 | deviceType: '', | 826 | deviceType: '', |
| 821 | createUser: '', | 827 | createUser: '', |
| 822 | createDate: '', | 828 | createDate: '', |
| 829 | + advertisingName:'', | ||
| 830 | + rotationOrder:'', | ||
| 831 | + advertisingMaterial:'', | ||
| 823 | pageNumber: 1, | 832 | pageNumber: 1, |
| 824 | pageSize: 10, | 833 | pageSize: 10, |
| 825 | advertisingType: '' | 834 | advertisingType: '' |
| @@ -1102,7 +1111,7 @@ | @@ -1102,7 +1111,7 @@ | ||
| 1102 | this.total = res.data.numberOfElements | 1111 | this.total = res.data.numberOfElements |
| 1103 | }) | 1112 | }) |
| 1104 | } | 1113 | } |
| 1105 | - console.log(this.currentPage) | 1114 | + |
| 1106 | // if(this.formSel.createDate=='' && this.formSel.createUser == '' && this.formSel.affiliation == ''){ | 1115 | // if(this.formSel.createDate=='' && this.formSel.createUser == '' && this.formSel.affiliation == ''){ |
| 1107 | // console.log(1) | 1116 | // console.log(1) |
| 1108 | // console.log(this.pageindex) | 1117 | // console.log(this.pageindex) |
| @@ -1151,6 +1160,9 @@ | @@ -1151,6 +1160,9 @@ | ||
| 1151 | deviceType: '', | 1160 | deviceType: '', |
| 1152 | createUser: '', | 1161 | createUser: '', |
| 1153 | createDate: '', | 1162 | createDate: '', |
| 1163 | + advertisingName:'', | ||
| 1164 | + rotationOrder:'', | ||
| 1165 | + advertisingMaterial:'', | ||
| 1154 | pageNumber: 1, | 1166 | pageNumber: 1, |
| 1155 | pageSize: 10, | 1167 | pageSize: 10, |
| 1156 | advertisingType: '' | 1168 | advertisingType: '' |
yanshouban/src/views/detect/ziyuanList.vue
| @@ -75,6 +75,10 @@ | @@ -75,6 +75,10 @@ | ||
| 75 | </el-form-item> | 75 | </el-form-item> |
| 76 | <el-form-item label="商铺业态" prop="commercialForm"> | 76 | <el-form-item label="商铺业态" prop="commercialForm"> |
| 77 | <el-select v-model="ruleForm.commercialForm" :disabled="edit" style="margin-top:5px;width: 100%;"> | 77 | <el-select v-model="ruleForm.commercialForm" :disabled="edit" style="margin-top:5px;width: 100%;"> |
| 78 | + <el-option label="零售业态" value="零售业态"></el-option> | ||
| 79 | + <el-option label="餐饮业态" value="餐饮业态"></el-option> | ||
| 80 | + <el-option label="服务业态" value="服务业态"></el-option> | ||
| 81 | + <el-option label="娱乐业态" value="娱乐业态"></el-option> | ||
| 78 | <el-option label="商超" value="商超"></el-option> | 82 | <el-option label="商超" value="商超"></el-option> |
| 79 | </el-select> | 83 | </el-select> |
| 80 | </el-form-item> | 84 | </el-form-item> |
yanshouban/src/views/scheme/planningBz.vue
| @@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
| 38 | style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">录入</el-button> | 38 | style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">录入</el-button> |
| 39 | <!-- <el-button @click="addbuss(1)" | 39 | <!-- <el-button @click="addbuss(1)" |
| 40 | style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">招商规划方案参数化配置</el-button> --> | 40 | style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">招商规划方案参数化配置</el-button> --> |
| 41 | - <el-upload class="upload-demo" ref="upload" | 41 | + <!-- <el-upload class="upload-demo" ref="upload" |
| 42 | :limit="1" | 42 | :limit="1" |
| 43 | accept=".xlsx" | 43 | accept=".xlsx" |
| 44 | :action="upload" | 44 | :action="upload" |
| @@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
| 47 | :auto-upload="true" | 47 | :auto-upload="true" |
| 48 | :show-file-list="false"> | 48 | :show-file-list="false"> |
| 49 | <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;margin-left:15px;" class="buttonHover">导入</el-button> | 49 | <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;margin-left:15px;" class="buttonHover">导入</el-button> |
| 50 | - </el-upload> | 50 | + </el-upload> --> |
| 51 | </div> | 51 | </div> |
| 52 | 52 | ||
| 53 | <!-- 表格 --> | 53 | <!-- 表格 --> |
| @@ -242,8 +242,9 @@ | @@ -242,8 +242,9 @@ | ||
| 242 | 242 | ||
| 243 | <el-row :gutter="20"> | 243 | <el-row :gutter="20"> |
| 244 | <el-col :span="24"> | 244 | <el-col :span="24"> |
| 245 | - <div style="display: flex;align-items: baseline;" v-if="xiangqing==1" > | ||
| 246 | - <div style="height:20px; padding: 0 0 0 12px;color:#000000e6;">规划目标</div> | 245 | + |
| 246 | + <div style="display: flex;align-items: baseline;" v-if="xiangqing==1" > | ||
| 247 | + <div style="height:20px; padding: 0 0px 0 0px;color:#000000e6;text-align: right;width:110px;">规划目标</div> | ||
| 247 | <div style="padding:20px 10px; width:90%" v-html="secondData.planningObjectives" ></div> | 248 | <div style="padding:20px 10px; width:90%" v-html="secondData.planningObjectives" ></div> |
| 248 | </div> | 249 | </div> |
| 249 | <el-form-item label="规划目标" prop="planningObjectives" style="margin-bottom:20px;" v-else> | 250 | <el-form-item label="规划目标" prop="planningObjectives" style="margin-bottom:20px;" v-else> |
| @@ -257,7 +258,7 @@ | @@ -257,7 +258,7 @@ | ||
| 257 | <el-row :gutter="20"> | 258 | <el-row :gutter="20"> |
| 258 | <el-col :span="24"> | 259 | <el-col :span="24"> |
| 259 | <div style="display: flex;align-items: baseline;" v-if="xiangqing==1" > | 260 | <div style="display: flex;align-items: baseline;" v-if="xiangqing==1" > |
| 260 | - <div style="height:20px; padding: 0 0 0 12px;color:#000000e6;">规划背景</div> | 261 | + <div style="height:20px; padding: 0 0px 0 0px;color:#000000e6;text-align: right;width:110px;">规划背景</div> |
| 261 | <div style="padding:20px 10px;width:90%" v-html="secondData.planningBackground" ></div> | 262 | <div style="padding:20px 10px;width:90%" v-html="secondData.planningBackground" ></div> |
| 262 | </div> | 263 | </div> |
| 263 | <el-form-item label="规划背景" prop="planningBackground" style="margin-bottom:20px;" v-else> | 264 | <el-form-item label="规划背景" prop="planningBackground" style="margin-bottom:20px;" v-else> |
| @@ -270,7 +271,7 @@ | @@ -270,7 +271,7 @@ | ||
| 270 | <el-row :gutter="20"> | 271 | <el-row :gutter="20"> |
| 271 | <el-col :span="24"> | 272 | <el-col :span="24"> |
| 272 | <div style="display: flex;align-items: baseline;" v-if="xiangqing==1" > | 273 | <div style="display: flex;align-items: baseline;" v-if="xiangqing==1" > |
| 273 | - <div style="height:20px; padding: 0 0 0 12px;color:#000000e6;">规划内容</div> | 274 | + <div style="height:20px; padding: 0 0px 0 0px;color:#000000e6;text-align: right;width:110px;">规划内容</div> |
| 274 | <div style="padding:20px 10px;width:90%;" v-html="secondData.planningContent" ></div> | 275 | <div style="padding:20px 10px;width:90%;" v-html="secondData.planningContent" ></div> |
| 275 | </div> | 276 | </div> |
| 276 | <el-form-item label="规划内容" prop="planningContent" style="margin-bottom:20px;" v-else> | 277 | <el-form-item label="规划内容" prop="planningContent" style="margin-bottom:20px;" v-else> |
| @@ -295,7 +296,17 @@ | @@ -295,7 +296,17 @@ | ||
| 295 | </el-form-item> | 296 | </el-form-item> |
| 296 | </el-col> | 297 | </el-col> |
| 297 | </el-row> | 298 | </el-row> |
| 299 | +<el-row :gutter="20"> | ||
| 300 | + <el-col :span="12"> | ||
| 301 | + <el-form-item label="审核状态"> | ||
| 302 | + | ||
| 303 | + <div style="line-height:40px;" > | ||
| 304 | + {{ secondData.reviewStatus == "1" ? "待审核" :secondData.reviewStatus == "2" ?'已通过' :secondData.reviewStatus == "3" ?'已驳回' :'' }} | ||
| 305 | + </div> | ||
| 298 | 306 | ||
| 307 | + </el-form-item> | ||
| 308 | + </el-col> | ||
| 309 | + </el-row> | ||
| 299 | <el-row :gutter="20"> | 310 | <el-row :gutter="20"> |
| 300 | <el-col :span="12"> | 311 | <el-col :span="12"> |
| 301 | <el-form-item> | 312 | <el-form-item> |
| @@ -525,8 +536,8 @@ this.total = res.data.content.length | @@ -525,8 +536,8 @@ this.total = res.data.content.length | ||
| 525 | if (valid) { | 536 | if (valid) { |
| 526 | if(this.xin_time.length !=0 ){ | 537 | if(this.xin_time.length !=0 ){ |
| 527 | 538 | ||
| 528 | - this.form.implementationStartTime = this.xin_time[0] | ||
| 529 | - this.form.implementationEndTime = this.xin_time[1] | 539 | + this.form.implementationStartTime = this.implementationStartTime[0] |
| 540 | + this.form.implementationEndTime = this.implementationStartTime[1] | ||
| 530 | }else{ | 541 | }else{ |
| 531 | this.$message({ | 542 | this.$message({ |
| 532 | message: '请选择实施时间', | 543 | message: '请选择实施时间', |
yanshouban/src/views/scheme/planningPar.vue
| @@ -358,14 +358,19 @@ | @@ -358,14 +358,19 @@ | ||
| 358 | range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> | 358 | range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> |
| 359 | </el-date-picker> | 359 | </el-date-picker> |
| 360 | </el-form-item> | 360 | </el-form-item> |
| 361 | + <el-row :gutter="20"> | ||
| 362 | + <el-col :span="24"> | ||
| 363 | + <div style="display: flex;align-items: baseline;width:100%"> | ||
| 364 | + <div style="height:20px; padding: 0 0px 0 0px;color:#000000e6;text-align: right;width:141;">规划目标</div> | ||
| 365 | + <div style="padding:20px 10px 20px 30px;" v-html="secondData.planningObjectives" ></div> | ||
| 366 | + </div> | ||
| 367 | + | ||
| 368 | + </el-col> | ||
| 369 | + </el-row> | ||
| 361 | 370 | ||
| 362 | - <div style="display: flex;align-items: baseline;"> | ||
| 363 | - <div style="height:20px; padding: 0 0 0 12px;color:#000000e6;width:29%">规划目标</div> | ||
| 364 | - <div style="padding:20px 10px;" v-html="secondData.planningObjectives" ></div> | ||
| 365 | - </div> | ||
| 366 | 371 | ||
| 367 | <div style="display: flex;align-items: baseline;"> | 372 | <div style="display: flex;align-items: baseline;"> |
| 368 | - <div style="height:20px; padding: 0 0 0 12px;color:#000000e6;width:29%">规划背景</div> | 373 | + <div style="height:20px; padding: 0 0px 0 0px;color:#000000e6;text-align: right;width:110px;"> 规划背景</div> |
| 369 | <div style="padding:20px 10px;" v-html="secondData.planningBackground" ></div> | 374 | <div style="padding:20px 10px;" v-html="secondData.planningBackground" ></div> |
| 370 | </div> | 375 | </div> |
| 371 | 376 | ||
| @@ -537,7 +542,7 @@ | @@ -537,7 +542,7 @@ | ||
| 537 | <el-row :gutter="20"> | 542 | <el-row :gutter="20"> |
| 538 | <el-col :span="24"> | 543 | <el-col :span="24"> |
| 539 | <div style="display: flex;align-items: baseline;" > | 544 | <div style="display: flex;align-items: baseline;" > |
| 540 | - <div style="height:20px; padding: 0 0 0 12px;color:#000000e6;">规划目标</div> | 545 | + <div style="height:20px; padding: 0 0px 0 0px;color:#000000e6;text-align: right;width:110px;">规划目标</div> |
| 541 | <div style="padding:20px 10px; width:90%" v-html="secondData.planningObjectives" ></div> | 546 | <div style="padding:20px 10px; width:90%" v-html="secondData.planningObjectives" ></div> |
| 542 | </div> | 547 | </div> |
| 543 | 548 | ||
| @@ -549,7 +554,7 @@ | @@ -549,7 +554,7 @@ | ||
| 549 | <el-row :gutter="20"> | 554 | <el-row :gutter="20"> |
| 550 | <el-col :span="24"> | 555 | <el-col :span="24"> |
| 551 | <div style="display: flex;align-items: baseline;" > | 556 | <div style="display: flex;align-items: baseline;" > |
| 552 | - <div style="height:20px; padding: 0 0 0 12px;color:#000000e6;">规划背景</div> | 557 | + <div style="height:20px; padding: 0 0px 0 0px;color:#000000e6;text-align: right;width:110px;">规划背景</div> |
| 553 | <div style="padding:20px 10px;width:90%" v-html="secondData.planningBackground" ></div> | 558 | <div style="padding:20px 10px;width:90%" v-html="secondData.planningBackground" ></div> |
| 554 | </div> | 559 | </div> |
| 555 | 560 | ||
| @@ -560,7 +565,7 @@ | @@ -560,7 +565,7 @@ | ||
| 560 | <el-row :gutter="20"> | 565 | <el-row :gutter="20"> |
| 561 | <el-col :span="24"> | 566 | <el-col :span="24"> |
| 562 | <div style="display: flex;align-items: baseline;"> | 567 | <div style="display: flex;align-items: baseline;"> |
| 563 | - <div style="height:20px; padding: 0 0 0 12px;color:#000000e6;">规划内容</div> | 568 | + <div style="height:20px; padding: 0 0px 0 0px;color:#000000e6;text-align: right;width:110px;">规划内容</div> |
| 564 | <div style="padding:20px 10px;width:90%;" v-html="secondData.planningContent" ></div> | 569 | <div style="padding:20px 10px;width:90%;" v-html="secondData.planningContent" ></div> |
| 565 | </div> | 570 | </div> |
| 566 | 571 | ||
| @@ -578,7 +583,17 @@ | @@ -578,7 +583,17 @@ | ||
| 578 | </el-form-item> | 583 | </el-form-item> |
| 579 | </el-col> | 584 | </el-col> |
| 580 | </el-row> | 585 | </el-row> |
| 586 | +<el-row :gutter="20"> | ||
| 587 | + <el-col :span="12"> | ||
| 588 | + <el-form-item label="审核状态"> | ||
| 581 | 589 | ||
| 590 | + <div style="line-height:40px;" > | ||
| 591 | + {{ secondData.reviewStatus == "1" ? "待审核" :secondData.reviewStatus == "2" ?'已通过' :secondData.reviewStatus == "3" ?'已驳回' :'' }} | ||
| 592 | + </div> | ||
| 593 | + | ||
| 594 | + </el-form-item> | ||
| 595 | + </el-col> | ||
| 596 | + </el-row> | ||
| 582 | <el-row :gutter="20"> | 597 | <el-row :gutter="20"> |
| 583 | <el-col :span="12"> | 598 | <el-col :span="12"> |
| 584 | <el-form-item> | 599 | <el-form-item> |
yanshouban/src/views/scheme/sam.vue
| @@ -26,22 +26,14 @@ | @@ -26,22 +26,14 @@ | ||
| 26 | <div style="width:68px;height:36px;line-height:32px;">经营类型</div> | 26 | <div style="width:68px;height:36px;line-height:32px;">经营类型</div> |
| 27 | <el-select v-model="formSel.businessType" placeholder="请选择" | 27 | <el-select v-model="formSel.businessType" placeholder="请选择" |
| 28 | style="width:168px;margin-right: 15px"> | 28 | style="width:168px;margin-right: 15px"> |
| 29 | - <el-option label="商铺" value="商铺" /> | ||
| 30 | - <el-option label="场地" value="场地" /> | ||
| 31 | - <el-option label="广告位" value="广告位" /> | ||
| 32 | - </el-select> | ||
| 33 | - <div style="width:68px;height:36px;line-height:32px;">是否出租</div> | ||
| 34 | - <el-select v-model="formSel.isRental" placeholder="请选择" | ||
| 35 | - style="width:168px;margin-right: 15px"> | ||
| 36 | - <el-option label="否" value="0" /> | ||
| 37 | - <el-option label="是" value="1" /> | ||
| 38 | - </el-select> | ||
| 39 | - <div style="width:68px;height:36px;line-height:32px;">是否自营</div> | ||
| 40 | - <el-select v-model="formSel.isSelfOperated" placeholder="请选择" | ||
| 41 | - style="width:168px;"> | ||
| 42 | - <el-option label="否" value="0" /> | ||
| 43 | - <el-option label="是" value="1" /> | 29 | + <el-option label="零售" value="零售" /> |
| 30 | + <el-option label="餐饮" value="餐饮" /> | ||
| 31 | + <el-option label="服务" value="服务" /> | ||
| 44 | </el-select> | 32 | </el-select> |
| 33 | + | ||
| 34 | + | ||
| 35 | + | ||
| 36 | + | ||
| 45 | </div> | 37 | </div> |
| 46 | <div> | 38 | <div> |
| 47 | <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询 | 39 | <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询 |
| @@ -54,8 +46,8 @@ | @@ -54,8 +46,8 @@ | ||
| 54 | <div style="margin:20px 0;"> | 46 | <div style="margin:20px 0;"> |
| 55 | <el-button icon="el-icon-circle-plus-outline" @click="addbuss(1)" | 47 | <el-button icon="el-icon-circle-plus-outline" @click="addbuss(1)" |
| 56 | style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">新增</el-button> | 48 | style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">新增</el-button> |
| 57 | - <el-button @click="addressShow =true" | ||
| 58 | - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">商铺位置管理</el-button> | 49 | + <!-- <el-button @click="addressShow =true" |
| 50 | + style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">商铺位置管理</el-button> --> | ||
| 59 | </div> | 51 | </div> |
| 60 | 52 | ||
| 61 | <!-- 表格 --> | 53 | <!-- 表格 --> |
| @@ -80,15 +72,9 @@ | @@ -80,15 +72,9 @@ | ||
| 80 | </el-table-column> | 72 | </el-table-column> |
| 81 | <el-table-column label="是否出租" prop="isRental" min-width="100" > | 73 | <el-table-column label="是否出租" prop="isRental" min-width="100" > |
| 82 | <template slot-scope="scope"> | 74 | <template slot-scope="scope"> |
| 83 | - {{scope.row.isRental == '0'?'否':'是'}} | 75 | + {{scope.row.isRental == '0'?'自营':'是'}} |
| 84 | </template> | 76 | </template> |
| 85 | </el-table-column> | 77 | </el-table-column> |
| 86 | - <el-table-column label="是否自营" prop="planningObjectives" min-width="100" > | ||
| 87 | - <template slot-scope="scope"> | ||
| 88 | - {{scope.row.isSelfOperated == '0'?'否':'是'}} | ||
| 89 | - </template> | ||
| 90 | - </el-table-column> | ||
| 91 | - | ||
| 92 | <el-table-column label="操作" min-width="200" > | 78 | <el-table-column label="操作" min-width="200" > |
| 93 | <template slot-scope="scope"> | 79 | <template slot-scope="scope"> |
| 94 | <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div> | 80 | <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div> |
| @@ -128,30 +114,22 @@ | @@ -128,30 +114,22 @@ | ||
| 128 | <el-col :span="12"> | 114 | <el-col :span="12"> |
| 129 | <el-form-item label="是否出租" prop="isRental"> | 115 | <el-form-item label="是否出租" prop="isRental"> |
| 130 | <el-select v-model="secondData.isRental" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false"> | 116 | <el-select v-model="secondData.isRental" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false"> |
| 131 | - <el-option label="否" value="0" /> | 117 | + <el-option label="自营" value="0" /> |
| 132 | <el-option label="是" value="1" /> | 118 | <el-option label="是" value="1" /> |
| 133 | </el-select> | 119 | </el-select> |
| 134 | </el-form-item> | 120 | </el-form-item> |
| 135 | </el-col> | 121 | </el-col> |
| 136 | <el-col :span="12"> | 122 | <el-col :span="12"> |
| 137 | - <el-form-item label="是否自营" prop="isSelfOperated"> | ||
| 138 | - <el-select v-model="secondData.isSelfOperated" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false"> | ||
| 139 | - <el-option label="否" value="0" /> | ||
| 140 | - <el-option label="是" value="1" /> | ||
| 141 | - </el-select> | ||
| 142 | - </el-form-item> | ||
| 143 | - </el-col> | ||
| 144 | - </el-row> | ||
| 145 | - <el-row> | ||
| 146 | - <el-col :span="12"> | ||
| 147 | <el-form-item label="经营类型" prop="businessType"> | 123 | <el-form-item label="经营类型" prop="businessType"> |
| 148 | <el-select v-model="secondData.businessType" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false"> | 124 | <el-select v-model="secondData.businessType" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false"> |
| 149 | - <el-option label="商铺" value="商铺" /> | ||
| 150 | - <el-option label="场地" value="场地" /> | ||
| 151 | - <el-option label="广告位" value="广告位" /> | 125 | + <el-option label="零售" value="零售" /> |
| 126 | + <el-option label="餐饮" value="餐饮" /> | ||
| 127 | + <el-option label="服务" value="服务" /> | ||
| 152 | </el-select> | 128 | </el-select> |
| 153 | </el-form-item> | 129 | </el-form-item> |
| 154 | </el-col> | 130 | </el-col> |
| 131 | + </el-row> | ||
| 132 | + <el-row> | ||
| 155 | <el-col :span="12"> | 133 | <el-col :span="12"> |
| 156 | <el-form-item label="租金价格" prop="rentalPrice"> | 134 | <el-form-item label="租金价格" prop="rentalPrice"> |
| 157 | <el-input v-model="secondData.rentalPrice" style="width: 72%;margin-right: 15px;" :disabled="xiangqing==1?true:false"> | 135 | <el-input v-model="secondData.rentalPrice" style="width: 72%;margin-right: 15px;" :disabled="xiangqing==1?true:false"> |
| @@ -162,21 +140,13 @@ | @@ -162,21 +140,13 @@ | ||
| 162 | 140 | ||
| 163 | </el-form-item> | 141 | </el-form-item> |
| 164 | </el-col> | 142 | </el-col> |
| 165 | - </el-row> | ||
| 166 | - <el-row> | ||
| 167 | <el-col :span="12"> | 143 | <el-col :span="12"> |
| 168 | <el-form-item label="商铺租期" prop="leaseTerm"> | 144 | <el-form-item label="商铺租期" prop="leaseTerm"> |
| 169 | <el-input v-model="secondData.leaseTerm" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input> | 145 | <el-input v-model="secondData.leaseTerm" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input> |
| 170 | </el-form-item> | 146 | </el-form-item> |
| 171 | </el-col> | 147 | </el-col> |
| 172 | - <el-col :span="12"> | ||
| 173 | - <el-form-item label="租赁时段" prop="leaseDate"> | ||
| 174 | - <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | ||
| 175 | - start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;" :disabled="xiangqing==1?true:false"> | ||
| 176 | - </el-date-picker> | ||
| 177 | - </el-form-item> | ||
| 178 | - </el-col> | ||
| 179 | </el-row> | 148 | </el-row> |
| 149 | + | ||
| 180 | <el-row> | 150 | <el-row> |
| 181 | <el-col :span="12"> | 151 | <el-col :span="12"> |
| 182 | <el-form-item label="免租条件" prop="rentFreeCondition"> | 152 | <el-form-item label="免租条件" prop="rentFreeCondition"> |
| @@ -204,6 +174,16 @@ | @@ -204,6 +174,16 @@ | ||
| 204 | </el-form-item> | 174 | </el-form-item> |
| 205 | </el-col> | 175 | </el-col> |
| 206 | </el-row> | 176 | </el-row> |
| 177 | + <el-row> | ||
| 178 | + | ||
| 179 | + <el-col :span="12"> | ||
| 180 | + <el-form-item label="租赁时段" prop="leaseDate"> | ||
| 181 | + <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | ||
| 182 | + start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;" :disabled="xiangqing==1?true:false"> | ||
| 183 | + </el-date-picker> | ||
| 184 | + </el-form-item> | ||
| 185 | + </el-col> | ||
| 186 | + </el-row> | ||
| 207 | </el-form> | 187 | </el-form> |
| 208 | <div style="display: flex;justify-content: flex-end;"> | 188 | <div style="display: flex;justify-content: flex-end;"> |
| 209 | <el-button @click="closexaing(1)" class="buttonHover" | 189 | <el-button @click="closexaing(1)" class="buttonHover" |
| @@ -345,12 +325,22 @@ this.getAll() | @@ -345,12 +325,22 @@ this.getAll() | ||
| 345 | //详情点击 | 325 | //详情点击 |
| 346 | handleEditForm(item,val) { | 326 | handleEditForm(item,val) { |
| 347 | this.secondData = item | 327 | this.secondData = item |
| 328 | + console.log(item.leaseStartDate,item.leaseEndDate) | ||
| 348 | this.xiangqing = val | 329 | this.xiangqing = val |
| 349 | this.xiang = true | 330 | this.xiang = true |
| 350 | - this.paymentDate[0] = item.paymentStartDate | ||
| 351 | - this.paymentDate[1] = item.paymentEndDate | ||
| 352 | - this.leaseDate[0] = item.leaseStartDate | ||
| 353 | - this.leaseDate[1] = item.leaseEndDate | 331 | + this.$set(this.leaseDate, 0, item.leaseStartDate); |
| 332 | + this.$set(this.leaseDate, 1, item.leaseEndDate); | ||
| 333 | + this.$set(this.paymentDate, 0, item.paymentStartDate); | ||
| 334 | + this.$set(this.paymentDate, 1, item.paymentEndDate); | ||
| 335 | + // if(item.paymentStartDate !=''){ | ||
| 336 | + // this.paymentDate[0] = item.paymentStartDate | ||
| 337 | + // this.paymentDate[1] = item.paymentEndDate | ||
| 338 | + // } | ||
| 339 | + // if(item.leaseStartDate !=''){ | ||
| 340 | + // this.leaseDate[0] = item.leaseStartDate | ||
| 341 | + // this.leaseDate[1] = item.leaseEndDate | ||
| 342 | + // } | ||
| 343 | + | ||
| 354 | }, | 344 | }, |
| 355 | 345 | ||
| 356 | handleCurrentChange(val) { | 346 | handleCurrentChange(val) { |
yanshouban/src/views/scheme/samXin.vue
| @@ -24,22 +24,12 @@ | @@ -24,22 +24,12 @@ | ||
| 24 | <el-col :span="12"> | 24 | <el-col :span="12"> |
| 25 | <el-form-item label="是否出租" prop="isRental"> | 25 | <el-form-item label="是否出租" prop="isRental"> |
| 26 | <el-select v-model="form.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px"> | 26 | <el-select v-model="form.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px"> |
| 27 | - <el-option label="否" value="0" /> | 27 | + <el-option label="自营" value="0" /> |
| 28 | <el-option label="是" value="1" /> | 28 | <el-option label="是" value="1" /> |
| 29 | </el-select> | 29 | </el-select> |
| 30 | </el-form-item> | 30 | </el-form-item> |
| 31 | </el-col> | 31 | </el-col> |
| 32 | <el-col :span="12"> | 32 | <el-col :span="12"> |
| 33 | - <el-form-item label="是否自营" prop="isSelfOperated"> | ||
| 34 | - <el-select v-model="form.isSelfOperated" placeholder="请选择" style="width: 72%;margin-right: 15px"> | ||
| 35 | - <el-option label="否" value="0" /> | ||
| 36 | - <el-option label="是" value="1" /> | ||
| 37 | - </el-select> | ||
| 38 | - </el-form-item> | ||
| 39 | - </el-col> | ||
| 40 | - </el-row> | ||
| 41 | - <el-row> | ||
| 42 | - <el-col :span="12"> | ||
| 43 | <el-form-item label="经营类型" prop="businessType"> | 33 | <el-form-item label="经营类型" prop="businessType"> |
| 44 | <el-select v-model="form.businessType" placeholder="请选择" style="width: 72%;margin-right: 15px"> | 34 | <el-select v-model="form.businessType" placeholder="请选择" style="width: 72%;margin-right: 15px"> |
| 45 | <el-option label="商铺" value="商铺" /> | 35 | <el-option label="商铺" value="商铺" /> |
| @@ -48,6 +38,8 @@ | @@ -48,6 +38,8 @@ | ||
| 48 | </el-select> | 38 | </el-select> |
| 49 | </el-form-item> | 39 | </el-form-item> |
| 50 | </el-col> | 40 | </el-col> |
| 41 | + </el-row> | ||
| 42 | + <el-row> | ||
| 51 | <el-col :span="12"> | 43 | <el-col :span="12"> |
| 52 | <el-form-item label="租金价格" prop="rentalPrice"> | 44 | <el-form-item label="租金价格" prop="rentalPrice"> |
| 53 | <el-input v-model="form.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px;" maxlength="30"> | 45 | <el-input v-model="form.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px;" maxlength="30"> |
| @@ -58,22 +50,14 @@ | @@ -58,22 +50,14 @@ | ||
| 58 | 50 | ||
| 59 | </el-form-item> | 51 | </el-form-item> |
| 60 | </el-col> | 52 | </el-col> |
| 61 | - </el-row> | ||
| 62 | - <el-row> | ||
| 63 | <el-col :span="12"> | 53 | <el-col :span="12"> |
| 64 | <el-form-item label="商铺租期" prop="leaseTerm"> | 54 | <el-form-item label="商铺租期" prop="leaseTerm"> |
| 65 | <el-input v-model="form.leaseTerm" style="width: 72%;" placeholder="请输入/年或/月" maxlength="20"></el-input> | 55 | <el-input v-model="form.leaseTerm" style="width: 72%;" placeholder="请输入/年或/月" maxlength="20"></el-input> |
| 66 | 56 | ||
| 67 | </el-form-item> | 57 | </el-form-item> |
| 68 | </el-col> | 58 | </el-col> |
| 69 | - <el-col :span="12"> | ||
| 70 | - <el-form-item label="租赁时段" prop="leaseDate"> | ||
| 71 | - <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | ||
| 72 | - start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;"> | ||
| 73 | - </el-date-picker> | ||
| 74 | - </el-form-item> | ||
| 75 | - </el-col> | ||
| 76 | </el-row> | 59 | </el-row> |
| 60 | + | ||
| 77 | <el-row> | 61 | <el-row> |
| 78 | <el-col :span="12"> | 62 | <el-col :span="12"> |
| 79 | <el-form-item label="免租条件" prop="rentFreeCondition"> | 63 | <el-form-item label="免租条件" prop="rentFreeCondition"> |
| @@ -101,6 +85,15 @@ | @@ -101,6 +85,15 @@ | ||
| 101 | </el-form-item> | 85 | </el-form-item> |
| 102 | </el-col> | 86 | </el-col> |
| 103 | </el-row> | 87 | </el-row> |
| 88 | + <el-row> | ||
| 89 | + <el-col :span="12"> | ||
| 90 | + <el-form-item label="租赁时段" prop="leaseDate"> | ||
| 91 | + <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | ||
| 92 | + start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;"> | ||
| 93 | + </el-date-picker> | ||
| 94 | + </el-form-item> | ||
| 95 | + </el-col> | ||
| 96 | + </el-row> | ||
| 104 | </el-form> | 97 | </el-form> |
| 105 | <div style="display: flex;justify-content: flex-end;margin-top:20px;"> | 98 | <div style="display: flex;justify-content: flex-end;margin-top:20px;"> |
| 106 | <el-button @click="closeFn()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;" | 99 | <el-button @click="closeFn()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;" |
| @@ -134,14 +127,10 @@ | @@ -134,14 +127,10 @@ | ||
| 134 | </el-table-column> | 127 | </el-table-column> |
| 135 | <el-table-column label="是否出租" prop="isRental" width="120"> | 128 | <el-table-column label="是否出租" prop="isRental" width="120"> |
| 136 | <template slot-scope="scope"> | 129 | <template slot-scope="scope"> |
| 137 | - {{scope.row.isrental == '0'?'否':'是'}} | ||
| 138 | - </template> | ||
| 139 | - </el-table-column> | ||
| 140 | - <el-table-column label="是否自营" prop="isSelfOperated" width="120"> | ||
| 141 | - <template slot-scope="scope"> | ||
| 142 | - {{scope.row.isSelfOperated == '0'?'否':'是'}} | 130 | + {{scope.row.isrental == '0'?'自营':'出租'}} |
| 143 | </template> | 131 | </template> |
| 144 | </el-table-column> | 132 | </el-table-column> |
| 133 | + | ||
| 145 | <el-table-column label="经营类型" prop="businessType" width="150"> | 134 | <el-table-column label="经营类型" prop="businessType" width="150"> |
| 146 | </el-table-column> | 135 | </el-table-column> |
| 147 | <el-table-column prop="rentalPrice" label="租金价格" width="150"> | 136 | <el-table-column prop="rentalPrice" label="租金价格" width="150"> |
| @@ -196,23 +185,12 @@ | @@ -196,23 +185,12 @@ | ||
| 196 | <el-col :span="12"> | 185 | <el-col :span="12"> |
| 197 | <el-form-item label="是否出租" prop="isRental"> | 186 | <el-form-item label="是否出租" prop="isRental"> |
| 198 | <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px"> | 187 | <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px"> |
| 199 | - <el-option label="否" value="0" /> | ||
| 200 | - <el-option label="是" value="1" /> | 188 | + <el-option label="自营" value="0" /> |
| 189 | + <el-option label="出租" value="1" /> | ||
| 201 | </el-select> | 190 | </el-select> |
| 202 | </el-form-item> | 191 | </el-form-item> |
| 203 | </el-col> | 192 | </el-col> |
| 204 | <el-col :span="12"> | 193 | <el-col :span="12"> |
| 205 | - <el-form-item label="是否自营" prop="isSelfOperated"> | ||
| 206 | - <el-select v-model="formInline.isSelfOperated" placeholder="请选择" | ||
| 207 | - style="width: 72%;margin-right: 15px"> | ||
| 208 | - <el-option label="否" value="0" /> | ||
| 209 | - <el-option label="是" value="1" /> | ||
| 210 | - </el-select> | ||
| 211 | - </el-form-item> | ||
| 212 | - </el-col> | ||
| 213 | - </el-row> | ||
| 214 | - <el-row> | ||
| 215 | - <el-col :span="12"> | ||
| 216 | <el-form-item label="经营类型" prop="businessType"> | 194 | <el-form-item label="经营类型" prop="businessType"> |
| 217 | <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 72%;margin-right: 15px"> | 195 | <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 72%;margin-right: 15px"> |
| 218 | <el-option label="商铺" value="商铺" /> | 196 | <el-option label="商铺" value="商铺" /> |
| @@ -221,6 +199,9 @@ | @@ -221,6 +199,9 @@ | ||
| 221 | </el-select> | 199 | </el-select> |
| 222 | </el-form-item> | 200 | </el-form-item> |
| 223 | </el-col> | 201 | </el-col> |
| 202 | + | ||
| 203 | + </el-row> | ||
| 204 | + <el-row> | ||
| 224 | <el-col :span="12"> | 205 | <el-col :span="12"> |
| 225 | <el-form-item label="租金价格" prop="rentalPrice"> | 206 | <el-form-item label="租金价格" prop="rentalPrice"> |
| 226 | <el-input v-model="formInline.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px" maxlength="30"> | 207 | <el-input v-model="formInline.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px" maxlength="30"> |
| @@ -231,22 +212,14 @@ | @@ -231,22 +212,14 @@ | ||
| 231 | 212 | ||
| 232 | </el-form-item> | 213 | </el-form-item> |
| 233 | </el-col> | 214 | </el-col> |
| 234 | - </el-row> | ||
| 235 | - <el-row> | ||
| 236 | <el-col :span="12"> | 215 | <el-col :span="12"> |
| 237 | <el-form-item label="商铺租期" prop="leaseTerm"> | 216 | <el-form-item label="商铺租期" prop="leaseTerm"> |
| 238 | <el-input v-model="formInline.leaseTerm" style="width: 72%;;margin-right: 15px" placeholder="请输入/年或/月" maxlength="20"></el-input> | 217 | <el-input v-model="formInline.leaseTerm" style="width: 72%;;margin-right: 15px" placeholder="请输入/年或/月" maxlength="20"></el-input> |
| 239 | 218 | ||
| 240 | </el-form-item> | 219 | </el-form-item> |
| 241 | </el-col> | 220 | </el-col> |
| 242 | - <el-col :span="12"> | ||
| 243 | - <el-form-item label="租赁时段" prop="leaseDate"> | ||
| 244 | - <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | ||
| 245 | - start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;"> | ||
| 246 | - </el-date-picker> | ||
| 247 | - </el-form-item> | ||
| 248 | - </el-col> | ||
| 249 | </el-row> | 221 | </el-row> |
| 222 | + | ||
| 250 | <el-row> | 223 | <el-row> |
| 251 | <el-col :span="12"> | 224 | <el-col :span="12"> |
| 252 | <el-form-item label="免租条件" prop="rentFreeCondition"> | 225 | <el-form-item label="免租条件" prop="rentFreeCondition"> |
| @@ -274,6 +247,16 @@ | @@ -274,6 +247,16 @@ | ||
| 274 | </el-form-item> | 247 | </el-form-item> |
| 275 | </el-col> | 248 | </el-col> |
| 276 | </el-row> | 249 | </el-row> |
| 250 | + <el-row> | ||
| 251 | + | ||
| 252 | + <el-col :span="12"> | ||
| 253 | + <el-form-item label="租赁时段" prop="leaseDate"> | ||
| 254 | + <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | ||
| 255 | + start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;"> | ||
| 256 | + </el-date-picker> | ||
| 257 | + </el-form-item> | ||
| 258 | + </el-col> | ||
| 259 | + </el-row> | ||
| 277 | </el-form> | 260 | </el-form> |
| 278 | <div style="display: flex;justify-content: flex-end;margin-top:20px;"> | 261 | <div style="display: flex;justify-content: flex-end;margin-top:20px;"> |
| 279 | <el-button @click="MingClose()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;" | 262 | <el-button @click="MingClose()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;" |
| @@ -376,11 +359,7 @@ | @@ -376,11 +359,7 @@ | ||
| 376 | message: '请选择是否出租', | 359 | message: '请选择是否出租', |
| 377 | trigger: 'change' | 360 | trigger: 'change' |
| 378 | }], | 361 | }], |
| 379 | - isSelfOperated: [{ | ||
| 380 | - required: true, | ||
| 381 | - message: '请选择是否出租', | ||
| 382 | - trigger: 'change' | ||
| 383 | - }], | 362 | + |
| 384 | businessType: [{ | 363 | businessType: [{ |
| 385 | required: true, | 364 | required: true, |
| 386 | message: '请选择经营类型', | 365 | message: '请选择经营类型', |
| @@ -416,11 +395,7 @@ | @@ -416,11 +395,7 @@ | ||
| 416 | message: '请选择是否出租', | 395 | message: '请选择是否出租', |
| 417 | trigger: 'change' | 396 | trigger: 'change' |
| 418 | }], | 397 | }], |
| 419 | - isSelfOperated: [{ | ||
| 420 | - required: true, | ||
| 421 | - message: '请选择是否出租', | ||
| 422 | - trigger: 'change' | ||
| 423 | - }], | 398 | + |
| 424 | businessType: [{ | 399 | businessType: [{ |
| 425 | required: true, | 400 | required: true, |
| 426 | message: '请选择经营类型', | 401 | message: '请选择经营类型', |
yslvdao-miniapp/pages/advertisement/advertisement.vue
| @@ -27,21 +27,21 @@ | @@ -27,21 +27,21 @@ | ||
| 27 | <view class="goods-list"> | 27 | <view class="goods-list"> |
| 28 | <view class="list" v-for="(item,index) in tableData" :key="index" @click="toDetail(item)"> | 28 | <view class="list" v-for="(item,index) in tableData" :key="index" @click="toDetail(item)"> |
| 29 | <view class="thumb"> | 29 | <view class="thumb"> |
| 30 | - <u-image width="20vw" height="20vw" :src="item.locationDiagram"></u-image> | 30 | + <u-image width="20vw" height="20vw" :src="item.cereAdvertisingInformation.locationDiagram"></u-image> |
| 31 | <!-- <image :src="item.locationDiagram" mode="widthFix"></image> --> | 31 | <!-- <image :src="item.locationDiagram" mode="widthFix"></image> --> |
| 32 | </view> | 32 | </view> |
| 33 | <view class="item"> | 33 | <view class="item"> |
| 34 | <view class="title"> | 34 | <view class="title"> |
| 35 | - <text class="one-omit">{{item.advertisingName}}</text> | 35 | + <text class="one-omit">{{item.cereAdvertisingInformation.advertisingName}}</text> |
| 36 | </view> | 36 | </view> |
| 37 | <view> | 37 | <view> |
| 38 | <view class="goods-list-text"> | 38 | <view class="goods-list-text"> |
| 39 | - <view class="goods-list-txt">轮播顺序：<text>{{item.rotationOrder}}</text></view> | ||
| 40 | - <view class="goods-list-txt">所属移动端：<text>{{item.affiliation}}</text></view> | 39 | + <view class="goods-list-txt">轮播顺序：<text>{{item.cereAdvertisingInformation.rotationOrder}}</text></view> |
| 40 | + <view class="goods-list-txt">所属移动端：<text>{{item.cereAdvertisingInformation.affiliation}}</text></view> | ||
| 41 | </view> | 41 | </view> |
| 42 | <view class="goods-list-text"> | 42 | <view class="goods-list-text"> |
| 43 | - <view class="goods-list-txt">投放定价：<text>100元/天</text></view> | ||
| 44 | - <view class="goods-list-txt">单次可租赁时间：<text>1天</text></view> | 43 | + <view class="goods-list-txt">投放定价：<text>{{item.cereReleasePoliciesVO[0]?item.cereReleasePoliciesVO[0].rentalPrice:0}}/{{item.cereReleasePoliciesVO[0]?item.cereReleasePoliciesVO[0].leaseTerm:'月'}}</text></view> |
| 44 | + <!-- <view class="goods-list-txt">单次可租赁时间：<text>1天</text></view> --> | ||
| 45 | </view> | 45 | </view> |
| 46 | </view> | 46 | </view> |
| 47 | </view> | 47 | </view> |
| @@ -63,6 +63,8 @@ | @@ -63,6 +63,8 @@ | ||
| 63 | pageindex: { | 63 | pageindex: { |
| 64 | pageNumber: 1, | 64 | pageNumber: 1, |
| 65 | pageSize: 10, | 65 | pageSize: 10, |
| 66 | + resourceType:'广告位', | ||
| 67 | + dataForm:'2' | ||
| 66 | }, | 68 | }, |
| 67 | typeshow: false, | 69 | typeshow: false, |
| 68 | typeList: [ | 70 | typeList: [ |
| @@ -90,7 +92,7 @@ | @@ -90,7 +92,7 @@ | ||
| 90 | //查询全数据 | 92 | //查询全数据 |
| 91 | getAll() { | 93 | getAll() { |
| 92 | let query = Object.assign(this.pageindex, this.query); | 94 | let query = Object.assign(this.pageindex, this.query); |
| 93 | - this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', query, 1).then(res => { | 95 | + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', query, 1).then(res => { |
| 94 | //成功回调 | 96 | //成功回调 |
| 95 | this.tableData = res.data.data.content; | 97 | this.tableData = res.data.data.content; |
| 96 | }).catch(err => { | 98 | }).catch(err => { |
| @@ -110,9 +112,10 @@ | @@ -110,9 +112,10 @@ | ||
| 110 | this.search(); | 112 | this.search(); |
| 111 | }, | 113 | }, |
| 112 | toDetail(item) { | 114 | toDetail(item) { |
| 113 | - let items = JSON.stringify(item) | 115 | + let items = JSON.stringify(item.cereAdvertisingInformation) |
| 116 | + let celue = JSON.stringify(item.cereReleasePoliciesVO) | ||
| 114 | uni.navigateTo({ | 117 | uni.navigateTo({ |
| 115 | - url: `/pages/advertisementDetail/advertisementDetail?item=${items}` | 118 | + url: `/pages/advertisementDetail/advertisementDetail?item=${items}&celue=${celue}` |
| 116 | }) | 119 | }) |
| 117 | }, | 120 | }, |
| 118 | 121 | ||
| @@ -151,7 +154,7 @@ | @@ -151,7 +154,7 @@ | ||
| 151 | pageSize: 10, | 154 | pageSize: 10, |
| 152 | advertisingType:val[0].label | 155 | advertisingType:val[0].label |
| 153 | } | 156 | } |
| 154 | - this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', page, 1).then(res => { | 157 | + this.$http.sendRequest('/cereReleaseInvestmentResources/likeGet', 'POST', page, 1).then(res => { |
| 155 | //成功回调 | 158 | //成功回调 |
| 156 | this.tableData = res.data.data.content | 159 | this.tableData = res.data.data.content |
| 157 | }) | 160 | }) |
yslvdao-miniapp/pages/field/field.vue
| @@ -66,12 +66,12 @@ | @@ -66,12 +66,12 @@ | ||
| 66 | <view class="goods-list"> | 66 | <view class="goods-list"> |
| 67 | <view class="list" v-for="(item,index) in tableData" :key="index" @click="reconciliationdetail(item)"> | 67 | <view class="list" v-for="(item,index) in tableData" :key="index" @click="reconciliationdetail(item)"> |
| 68 | <view class="thumb"> | 68 | <view class="thumb"> |
| 69 | - <u-image width="25vw" height="25vw" :src="item.displayImage"></u-image> | 69 | + <u-image width="25vw" height="25vw" :src="item.cereBasicInformationVenue.displayImage"></u-image> |
| 70 | <!-- <image :src="item.displayMainImage" mode=""></image> --> | 70 | <!-- <image :src="item.displayMainImage" mode=""></image> --> |
| 71 | </view> | 71 | </view> |
| 72 | <view class="item"> | 72 | <view class="item"> |
| 73 | <view class="title"> | 73 | <view class="title"> |
| 74 | - <text class="one-omit">{{item.venueName}}</text> | 74 | + <text class="one-omit">{{item.cereBasicInformationVenue.venueName}}</text> |
| 75 | </view> | 75 | </view> |
| 76 | <view class="tag"> | 76 | <view class="tag"> |
| 77 | <!-- <text>标签标签</text> | 77 | <!-- <text>标签标签</text> |
| @@ -79,17 +79,17 @@ | @@ -79,17 +79,17 @@ | ||
| 79 | </view> | 79 | </view> |
| 80 | <view class="introduce"> | 80 | <view class="introduce"> |
| 81 | <image :src="$imgUrl('/kefu.png')"></image> | 81 | <image :src="$imgUrl('/kefu.png')"></image> |
| 82 | - <text class="one-omit">{{item.detailedLocation}}</text> | 82 | + <text class="one-omit">{{item.cereBasicInformationVenue.detailedLocation}}</text> |
| 83 | </view> | 83 | </view> |
| 84 | <view class="like-goods"> | 84 | <view class="like-goods"> |
| 85 | <view class="retail-price"> | 85 | <view class="retail-price"> |
| 86 | <text>租金:</text> | 86 | <text>租金:</text> |
| 87 | <text class="min">￥</text> | 87 | <text class="min">￥</text> |
| 88 | - <text class="max">{{item.id*10}}</text> | ||
| 89 | - <text class="min">/月</text> | 88 | + <text class="max">{{item.cereReleasePoliciesVO[0]?item.cereReleasePoliciesVO[0].rentalPrice:0}}</text> |
| 89 | + <text class="min">{{item.cereReleasePoliciesVO[0]?item.cereReleasePoliciesVO[0].leaseTerm:'月'}}</text> | ||
| 90 | <text class="line"></text> | 90 | <text class="line"></text> |
| 91 | <text>面积:</text> | 91 | <text>面积:</text> |
| 92 | - <text class="max">{{item.actualArea}}</text> | 92 | + <text class="max">{{item.cereBasicInformationShop.actualUsableArea}}</text> |
| 93 | <text class="min">/m²</text> | 93 | <text class="min">/m²</text> |
| 94 | </view> | 94 | </view> |
| 95 | </view> | 95 | </view> |
| @@ -106,12 +106,18 @@ | @@ -106,12 +106,18 @@ | ||
| 106 | return { | 106 | return { |
| 107 | query:{ | 107 | query:{ |
| 108 | venueName:'', | 108 | venueName:'', |
| 109 | - pageNumber: 1, | ||
| 110 | - pageSize: 10, | 109 | + resourceType:'场地', |
| 110 | + pageNumber: 1, | ||
| 111 | + pageSize: 10 , | ||
| 112 | + dataForm:'2' | ||
| 111 | }, | 113 | }, |
| 112 | pageindex: { | 114 | pageindex: { |
| 113 | pageNumber: 1, | 115 | pageNumber: 1, |
| 114 | pageSize: 10, | 116 | pageSize: 10, |
| 117 | + resourceType:'场地', | ||
| 118 | + pageNumber: 1, | ||
| 119 | + pageSize: 10 , | ||
| 120 | + dataForm:'2' | ||
| 115 | }, | 121 | }, |
| 116 | areList: [ | 122 | areList: [ |
| 117 | {value: '武侯区', label: '武侯区'}, | 123 | {value: '武侯区', label: '武侯区'}, |
| @@ -135,7 +141,7 @@ | @@ -135,7 +141,7 @@ | ||
| 135 | //请求列表数据 | 141 | //请求列表数据 |
| 136 | getAll() { | 142 | getAll() { |
| 137 | let query = Object.assign(this.pageindex); | 143 | let query = Object.assign(this.pageindex); |
| 138 | - this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', query, 1).then(res => { | 144 | + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', query, 1).then(res => { |
| 139 | //成功回调 | 145 | //成功回调 |
| 140 | this.tableData = res.data.data.content | 146 | this.tableData = res.data.data.content |
| 141 | }).catch(err => { | 147 | }).catch(err => { |
| @@ -144,19 +150,20 @@ | @@ -144,19 +150,20 @@ | ||
| 144 | }) | 150 | }) |
| 145 | }, | 151 | }, |
| 146 | reconciliationdetail(item) { | 152 | reconciliationdetail(item) { |
| 147 | - let items = JSON.stringify(item) | 153 | + let items = JSON.stringify(item.cereBasicInformationVenue) |
| 154 | + let celue = JSON.stringify(item.cereReleasePoliciesVO) | ||
| 148 | uni.navigateTo({ | 155 | uni.navigateTo({ |
| 149 | - url: `/pages/details/details?item=${items}` | 156 | + url: `/pages/details/details?item=${items}&celue=${celue}` |
| 150 | }) | 157 | }) |
| 151 | }, | 158 | }, |
| 152 | search(){ | 159 | search(){ |
| 153 | - this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', this.query, 1).then(res => { | 160 | + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', this.query, 1).then(res => { |
| 154 | //成功回调 | 161 | //成功回调 |
| 155 | this.tableData = res.data.data.content | 162 | this.tableData = res.data.data.content |
| 156 | }) | 163 | }) |
| 157 | }, | 164 | }, |
| 158 | clearGet(){ | 165 | clearGet(){ |
| 159 | - this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', this.pageindex, 1).then(res => { | 166 | + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', this.pageindex, 1).then(res => { |
| 160 | //成功回调 | 167 | //成功回调 |
| 161 | this.tableData = res.data.data.content | 168 | this.tableData = res.data.data.content |
| 162 | }) | 169 | }) |
yslvdao-miniapp/pages/home/home.vue
| @@ -373,22 +373,22 @@ | @@ -373,22 +373,22 @@ | ||
| 373 | getALL(){ | 373 | getALL(){ |
| 374 | let pagesize = { | 374 | let pagesize = { |
| 375 | pageNumber: 1, | 375 | pageNumber: 1, |
| 376 | - pageSize: 2 | 376 | + pageSize: 10 |
| 377 | } | 377 | } |
| 378 | let actPages = { | 378 | let actPages = { |
| 379 | pageNumber: 1, | 379 | pageNumber: 1, |
| 380 | - pageSize: 2, | 380 | + pageSize: 10, |
| 381 | reviewStatus:'2' | 381 | reviewStatus:'2' |
| 382 | } | 382 | } |
| 383 | let shopAct = { | 383 | let shopAct = { |
| 384 | auditStatus:'3', | 384 | auditStatus:'3', |
| 385 | pageNumber: 1, | 385 | pageNumber: 1, |
| 386 | - pageSize: 2, | 386 | + pageSize: 10, |
| 387 | } | 387 | } |
| 388 | let shanghu = { | 388 | let shanghu = { |
| 389 | status:'1', | 389 | status:'1', |
| 390 | pageNumber: 1, | 390 | pageNumber: 1, |
| 391 | - pageSize: 2, | 391 | + pageSize: 10, |
| 392 | } | 392 | } |
| 393 | this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', pagesize,1).then(res => { | 393 | this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', pagesize,1).then(res => { |
| 394 | //成功回调 | 394 | //成功回调 |
| @@ -412,7 +412,7 @@ | @@ -412,7 +412,7 @@ | ||
| 412 | onCouponTab(type) { | 412 | onCouponTab(type) { |
| 413 | let pagesize = { | 413 | let pagesize = { |
| 414 | pageNumber: 1, | 414 | pageNumber: 1, |
| 415 | - pageSize: 2, | 415 | + pageSize: 10, |
| 416 | resourceType:'', | 416 | resourceType:'', |
| 417 | dataForm:'2' | 417 | dataForm:'2' |
| 418 | } | 418 | } |
| @@ -423,7 +423,7 @@ | @@ -423,7 +423,7 @@ | ||
| 423 | //成功回调 | 423 | //成功回调 |
| 424 | 424 | ||
| 425 | this.tableData = res.data.data.content | 425 | this.tableData = res.data.data.content |
| 426 | - console.log(this.tableData) | 426 | + |
| 427 | }).catch(err => { | 427 | }).catch(err => { |
| 428 | console.log(err) | 428 | console.log(err) |
| 429 | //请求失败 | 429 | //请求失败 |
yslvdao-miniapp/pages/login/login - 1.scss
0 → 100644
| 1 | +.page{ | ||
| 2 | + position: absolute; | ||
| 3 | + left: 0; | ||
| 4 | + top: 0; | ||
| 5 | + width: 100%; | ||
| 6 | + height: 100%; | ||
| 7 | + background-size: cover; | ||
| 8 | + background-color: #FFFFFF; | ||
| 9 | +} | ||
| 10 | +.logo{ | ||
| 11 | + height: 240rpx; | ||
| 12 | + padding: 0 6%; | ||
| 13 | + position: relative; | ||
| 14 | + z-index: 0; | ||
| 15 | + top: 140rpx; | ||
| 16 | + image{ | ||
| 17 | + width: 120rpx; | ||
| 18 | + height: 120rpx; | ||
| 19 | + } | ||
| 20 | +} | ||
| 21 | +.login-title { | ||
| 22 | + position: relative; | ||
| 23 | + z-index: 1; | ||
| 24 | + padding: 0 6%; | ||
| 25 | + .login-title-big { | ||
| 26 | + font-size: 50rpx; | ||
| 27 | + font-weight: bold; | ||
| 28 | + letter-spacing: 10rpx; | ||
| 29 | + } | ||
| 30 | + .login-title-small { | ||
| 31 | + font-size: 30rpx; | ||
| 32 | + color: #9BA2B0; | ||
| 33 | + margin-top: 10rpx; | ||
| 34 | + } | ||
| 35 | +} | ||
| 36 | +/* 填写 */ | ||
| 37 | +.input-info{ | ||
| 38 | + padding: 0 6%; | ||
| 39 | + // margin: 80rpx 0 40rpx 0; | ||
| 40 | + .info{ | ||
| 41 | + display: flex; | ||
| 42 | + align-items:center; | ||
| 43 | + justify-content: space-between; | ||
| 44 | + width: 100%; | ||
| 45 | + height: 100rpx; | ||
| 46 | + background-color: #fff; | ||
| 47 | + border-radius: 32rpx; | ||
| 48 | + margin-bottom: 40rpx; | ||
| 49 | + padding: 0 30rpx 0 40rpx; | ||
| 50 | + border: 2rpx solid rgba(15,187,89,0.1804); | ||
| 51 | + input{ | ||
| 52 | + width: 70%; | ||
| 53 | + height: 100%; | ||
| 54 | + font-size: 26rpx; | ||
| 55 | + color: #222222; | ||
| 56 | + } | ||
| 57 | + .info-icon { | ||
| 58 | + image { | ||
| 59 | + width: 28rpx; | ||
| 60 | + height: 28rpx; | ||
| 61 | + margin-right: 20rpx; | ||
| 62 | + } | ||
| 63 | + } | ||
| 64 | + .more{ | ||
| 65 | + display: flex; | ||
| 66 | + align-items: center; | ||
| 67 | + justify-content: flex-end; | ||
| 68 | + width: 32%; | ||
| 69 | + height: 100%; | ||
| 70 | + .iconfont{ | ||
| 71 | + font-size: 34rpx; | ||
| 72 | + } | ||
| 73 | + .mo{ | ||
| 74 | + font-size: 26rpx; | ||
| 75 | + padding-left: 20rpx; | ||
| 76 | + // margin-left: 10rpx; | ||
| 77 | + border-left: 2rpx solid #ccc; | ||
| 78 | + } | ||
| 79 | + } | ||
| 80 | + } | ||
| 81 | +} | ||
| 82 | +.check-box { | ||
| 83 | + display: flex; | ||
| 84 | + margin: 20rpx 6%; | ||
| 85 | + .check{ | ||
| 86 | + display: flex; | ||
| 87 | + align-items: center; | ||
| 88 | + text{ | ||
| 89 | + font-size: 38rpx; | ||
| 90 | + color: #959595; | ||
| 91 | + } | ||
| 92 | + .action{ | ||
| 93 | + color: #89B8FF; | ||
| 94 | + } | ||
| 95 | + } | ||
| 96 | +} | ||
| 97 | +/* 按钮 */ | ||
| 98 | +.btn-info{ | ||
| 99 | + display: flex; | ||
| 100 | + align-items: center; | ||
| 101 | + justify-content: center; | ||
| 102 | + width: 100%; | ||
| 103 | + .btn{ | ||
| 104 | + display: flex; | ||
| 105 | + align-items: center; | ||
| 106 | + justify-content: center; | ||
| 107 | + width: 88%; | ||
| 108 | + height: 90rpx; | ||
| 109 | + background-color:#0FBB59; | ||
| 110 | + border-radius: 32rpx; | ||
| 111 | + color: #FFFFFF; | ||
| 112 | + font-size: 32rpx; | ||
| 113 | + } | ||
| 114 | +} | ||
| 115 | +/* 操作 */ | ||
| 116 | +.operation{ | ||
| 117 | + display: flex; | ||
| 118 | + align-items: center; | ||
| 119 | + justify-content: space-between; | ||
| 120 | + padding: 0 6%; | ||
| 121 | + margin: 40rpx 0; | ||
| 122 | + text{ | ||
| 123 | + font-size: 28rpx; | ||
| 124 | + color: #555555; | ||
| 125 | + } | ||
| 126 | +} | ||
| 127 | + | ||
| 128 | +/* 其他 */ | ||
| 129 | +.other-ways{ | ||
| 130 | + display: flex; | ||
| 131 | + align-items: center; | ||
| 132 | + justify-content: space-between; | ||
| 133 | + width: 100%; | ||
| 134 | + height: 80rpx; | ||
| 135 | + margin-top: 100rpx; | ||
| 136 | + text{ | ||
| 137 | + font-size: 28rpx; | ||
| 138 | + color: #999999; | ||
| 139 | + } | ||
| 140 | +} | ||
| 141 | +.other-ways::after{ | ||
| 142 | + content: ""; | ||
| 143 | + width: 36%; | ||
| 144 | + height: 2rpx; | ||
| 145 | + background-color: #EEEEEE; | ||
| 146 | +} | ||
| 147 | +.other-ways::before{ | ||
| 148 | + content: ""; | ||
| 149 | + width: 36%; | ||
| 150 | + height: 2rpx; | ||
| 151 | + background-color: #EEEEEE; | ||
| 152 | +} | ||
| 153 | +/* 登录方式 */ | ||
| 154 | +.login-way{ | ||
| 155 | + position: absolute; | ||
| 156 | + bottom: 0; | ||
| 157 | + width: 100%; | ||
| 158 | + height: 200rpx; | ||
| 159 | + .way{ | ||
| 160 | + width: 50%; | ||
| 161 | + height: 100%; | ||
| 162 | + margin: 0 auto; | ||
| 163 | + image{ | ||
| 164 | + width: 535rpx; | ||
| 165 | + height: 180rpx; | ||
| 166 | + } | ||
| 167 | + } | ||
| 168 | +} |
yslvdao-miniapp/pages/login/login -1.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <view class="page"> | ||
| 3 | + <view style="display: flex;justify-content: space-between;padding: 20px;height: 64px;"> | ||
| 4 | + <view @click="goHome"><image :src="$imgUrl('/right2.png')" style="width: 20px;height: 20px; transform: rotate(180deg);"></image></view> | ||
| 5 | + <view>登录</view> | ||
| 6 | + <view class=""> | ||
| 7 | + </view> | ||
| 8 | + </view> | ||
| 9 | + <view class="container flex-items-plus flex-column" v-if="denglu==false"> | ||
| 10 | + | ||
| 11 | + <view class="login-logoBox"> | ||
| 12 | + <text style="color:#3f9b6a;font-weight:bold;font-size:30px;">锦江绿道</text> | ||
| 13 | + </view> | ||
| 14 | + <view class="loginTitle-text flex-column-plus flex-items font-color-666 fs26"> | ||
| 15 | + <text style="display: block;">为了给您提供更好的服务</text> | ||
| 16 | + <text style="display:block; ">我们需要您的授权哦~</text> | ||
| 17 | + </view> | ||
| 18 | + <view> | ||
| 19 | + <view class="loginBut" @click="goLogin">手机号登录</view> | ||
| 20 | + </view> | ||
| 21 | + <!-- <view class="flex-row-plus mar-top-30" style="margin-top: 30rpx;"> | ||
| 22 | + <text class="font-color-C5AA7B">还没有账号，</text> | ||
| 23 | + <text class="register-text" @click="goRegister">去注册</text> | ||
| 24 | + </view> --> | ||
| 25 | + <view style="margin-top:10px;"> | ||
| 26 | + <u-checkbox-group @change="checkboxGroupChange" shape="circle" :label-disabled="true"> | ||
| 27 | + <u-checkbox | ||
| 28 | + active-color="#3f9b6a" | ||
| 29 | + v-model="checked" | ||
| 30 | + name="tongyi" | ||
| 31 | + >我已阅读并同意<span style="color:#3f9b6a;" @click="goyinsi">《隐私政策》</span></u-checkbox> | ||
| 32 | + </u-checkbox-group> | ||
| 33 | + </view> | ||
| 34 | + </view> | ||
| 35 | + | ||
| 36 | + <view class="" v-if="denglu"> | ||
| 37 | + <!-- 填写区 --> | ||
| 38 | + <view class="input-info"> | ||
| 39 | + <view class="login-logoBox" style="margin-bottom: 20px;text-align: center;"> | ||
| 40 | + <text style="color:#3f9b6a;font-weight:bold;font-size:30px;">锦江绿道</text> | ||
| 41 | + </view> | ||
| 42 | + <view class="info"> | ||
| 43 | + | ||
| 44 | + <input type="tel" maxlength="11" v-model="form.username" placeholder="请输入账号"> | ||
| 45 | + <view class="more"></view> | ||
| 46 | + </view> | ||
| 47 | + | ||
| 48 | + <view class="info" > | ||
| 49 | + <input :password='!isPassword' v-model="form.password" maxlength="26" placeholder="请输入您的密码"> | ||
| 50 | + <!-- <view class="more" @click="isPassword = !isPassword"> | ||
| 51 | + <image src="../../static/login4.png"></image> | ||
| 52 | + </view> --> | ||
| 53 | + </view> | ||
| 54 | + </view> | ||
| 55 | + <!-- 按钮 --> | ||
| 56 | + <view class="btn-info"> | ||
| 57 | + <view class="btn" @click="register"> | ||
| 58 | + <text>登录</text> | ||
| 59 | + </view> | ||
| 60 | + </view> | ||
| 61 | + </view> | ||
| 62 | + | ||
| 63 | + </view> | ||
| 64 | +</template> | ||
| 65 | + | ||
| 66 | +<script> | ||
| 67 | + export default { | ||
| 68 | + data() { | ||
| 69 | + return { | ||
| 70 | + isLogin: false, | ||
| 71 | + isLoginWay: false, | ||
| 72 | + isPassword: false, | ||
| 73 | + denglu:false, | ||
| 74 | + // 表单 | ||
| 75 | + | ||
| 76 | + form: { | ||
| 77 | + username: '', | ||
| 78 | + password: '', | ||
| 79 | + rememberMe: false | ||
| 80 | + }, | ||
| 81 | + ischange: false, | ||
| 82 | + isTrue: false, | ||
| 83 | + num: 60, | ||
| 84 | + time: null, | ||
| 85 | + // cid | ||
| 86 | + checked:null, | ||
| 87 | + showTong:'', | ||
| 88 | + push_clientid:'' | ||
| 89 | + }; | ||
| 90 | + }, | ||
| 91 | + onShow(option) { | ||
| 92 | + console.log(option) | ||
| 93 | + | ||
| 94 | + }, | ||
| 95 | + methods: { | ||
| 96 | + goLogin(){ | ||
| 97 | + | ||
| 98 | + if(this.showTong == 'tongyi'){ | ||
| 99 | + this.denglu = true | ||
| 100 | + }else{ | ||
| 101 | + uni.showToast({ | ||
| 102 | + icon: 'none', | ||
| 103 | + title: '请阅读并同意隐私政策' | ||
| 104 | + }) | ||
| 105 | + } | ||
| 106 | + }, | ||
| 107 | + goRegister(){ | ||
| 108 | + | ||
| 109 | + }, | ||
| 110 | + goyinsi(){ | ||
| 111 | + uni.navigateTo({ | ||
| 112 | + url: '/pages/privacy/privacy' | ||
| 113 | + }); | ||
| 114 | + }, | ||
| 115 | + register() { | ||
| 116 | + if (this.form.phone == '') { | ||
| 117 | + uni.showToast({ | ||
| 118 | + icon: 'none', | ||
| 119 | + title: '请输入账号' | ||
| 120 | + }) | ||
| 121 | + return | ||
| 122 | + } | ||
| 123 | + if (this.form.password == '') { | ||
| 124 | + uni.showToast({ | ||
| 125 | + icon: 'none', | ||
| 126 | + title: '请输入密码' | ||
| 127 | + }) | ||
| 128 | + return | ||
| 129 | + } | ||
| 130 | + const data = { | ||
| 131 | + // username: JM.encrypt(this.form.username), | ||
| 132 | + // password: JM.encrypt(this.form.password), | ||
| 133 | + // rememberMe: this.form.rememberMe | ||
| 134 | + | ||
| 135 | + } | ||
| 136 | + this.$http.sendRequest('/business/login', 'POST',this.form,2).then(res => { | ||
| 137 | + if(res.data.code == ''){ | ||
| 138 | + uni.setStorageSync('token', res.data.data.token); | ||
| 139 | + uni.setStorageSync('shopId', res.data.data.shopId); | ||
| 140 | + uni.switchTab({ | ||
| 141 | + url: '/pages/home/home' | ||
| 142 | + }) | ||
| 143 | + }else{ | ||
| 144 | + uni.showToast({ | ||
| 145 | + icon: 'none', | ||
| 146 | + title: res.data.message | ||
| 147 | + }) | ||
| 148 | + } | ||
| 149 | + | ||
| 150 | + | ||
| 151 | + | ||
| 152 | + }) | ||
| 153 | + }, | ||
| 154 | + change() { | ||
| 155 | + this.ischange = !this.ischange | ||
| 156 | + }, | ||
| 157 | + | ||
| 158 | + goHome(){ | ||
| 159 | + uni.switchTab({ | ||
| 160 | + url: '/pages/home/home' | ||
| 161 | + }) | ||
| 162 | + }, | ||
| 163 | + /** | ||
| 164 | + * 登录点击 | ||
| 165 | + */ | ||
| 166 | + onLogin() {}, | ||
| 167 | + checkboxGroupChange(val){ | ||
| 168 | + this.showTong = val[0] | ||
| 169 | + console.log(this.showTong) | ||
| 170 | + } | ||
| 171 | + }, | ||
| 172 | + watch: { | ||
| 173 | + form: { | ||
| 174 | + handler(newValue, oldValue) { | ||
| 175 | + // 验证码 | ||
| 176 | + if (this.isLoginWay) { | ||
| 177 | + this.isLogin = newValue.newPassword && newValue.phone ? true : false; | ||
| 178 | + } | ||
| 179 | + // 账号密码 | ||
| 180 | + if (!this.isLoginWay) { | ||
| 181 | + this.isLogin = newValue.password && newValue.phone ? true : false; | ||
| 182 | + } | ||
| 183 | + }, | ||
| 184 | + deep: true | ||
| 185 | + }, | ||
| 186 | + num() { | ||
| 187 | + if (this.num == 0) { | ||
| 188 | + clearInterval(this.time) | ||
| 189 | + this.isTrue = false | ||
| 190 | + } | ||
| 191 | + } | ||
| 192 | + } | ||
| 193 | + | ||
| 194 | + } | ||
| 195 | +</script> | ||
| 196 | + | ||
| 197 | +<style scoped lang="scss"> | ||
| 198 | + @import 'login.scss'; | ||
| 199 | + .container { | ||
| 200 | + background-color: #FFFFFF; | ||
| 201 | + height: calc(100vh - 64px); | ||
| 202 | + display: flex; | ||
| 203 | + flex-direction: column; | ||
| 204 | + align-items: center; | ||
| 205 | + justify-content: center; | ||
| 206 | + .login-logoBox { | ||
| 207 | + // margin-top: -200rpx; | ||
| 208 | + | ||
| 209 | + .login-logo { | ||
| 210 | + width: 200rpx; | ||
| 211 | + height: 167rpx; | ||
| 212 | + } | ||
| 213 | + } | ||
| 214 | + | ||
| 215 | + .loginTitle-text { | ||
| 216 | + margin-top: 100rpx; | ||
| 217 | + | ||
| 218 | + } | ||
| 219 | + | ||
| 220 | + .goToHome { | ||
| 221 | + background: none; | ||
| 222 | + border: none; | ||
| 223 | + width: auto; | ||
| 224 | + margin-top: 50rpx; | ||
| 225 | + color: #999999; | ||
| 226 | + text-decoration: underline; | ||
| 227 | + | ||
| 228 | + &:after { | ||
| 229 | + display: none; | ||
| 230 | + } | ||
| 231 | + } | ||
| 232 | + | ||
| 233 | + .loginWxBut { | ||
| 234 | + background: #3f9b6a; | ||
| 235 | + color: #FFEBC4; | ||
| 236 | + height: 88rpx; | ||
| 237 | + width: 600rpx; | ||
| 238 | + text-align: center; | ||
| 239 | + line-height: 88rpx; | ||
| 240 | + margin-top: 49rpx; | ||
| 241 | + } | ||
| 242 | + | ||
| 243 | + .loginBut { | ||
| 244 | + background-color: #3f9b6a; | ||
| 245 | + color: #FFEBC4; | ||
| 246 | + height: 88rpx; | ||
| 247 | + width: 600rpx; | ||
| 248 | + text-align: center; | ||
| 249 | + line-height: 88rpx; | ||
| 250 | + margin-top: 30rpx; | ||
| 251 | + } | ||
| 252 | + | ||
| 253 | + .register-text { | ||
| 254 | + color: #C5AA7B; | ||
| 255 | + } | ||
| 256 | + .font-color-C5AA7B{ | ||
| 257 | + color: #C5AA7B; | ||
| 258 | + } | ||
| 259 | + .font-color-666{ | ||
| 260 | + color: #666666; | ||
| 261 | + font-size: 12px; | ||
| 262 | + } | ||
| 263 | + } | ||
| 264 | +</style> | ||
| 265 | + | ||
| 266 | +<style scoped> | ||
| 267 | + .loginWxBut::after { | ||
| 268 | + border-radius: 0 !important; | ||
| 269 | + } | ||
| 270 | +</style> | ||
| 271 | + |
yslvdao-miniapp/pages/login/login.vue
| 1 | <template> | 1 | <template> |
| 2 | - <view class="page"> | ||
| 3 | - <view style="display: flex;justify-content: space-between;padding: 20px;height: 64px;"> | ||
| 4 | - <view @click="goHome"><image :src="$imgUrl('/right2.png')" style="width: 20px;height: 20px; transform: rotate(180deg);"></image></view> | ||
| 5 | - <view>登录</view> | ||
| 6 | - <view class=""> | 2 | + <view class="page" :style="{backgroundImage:`url(${$imgUrl('/homePhoto.png')})`}"> |
| 3 | + <view style="height: 100vh;width: 100%;position: fixed;bottom: 0;left: 0;"> | ||
| 4 | + <view style="width: 45%;margin: 0 auto;margin-top: 15vh;"> | ||
| 5 | + <image src="../../static/login/logo1.png" style="width: 100%;" mode="widthFix"></image> | ||
| 7 | </view> | 6 | </view> |
| 8 | - </view> | ||
| 9 | - <view class="container flex-items-plus flex-column" v-if="denglu==false"> | ||
| 10 | - | ||
| 11 | - <view class="login-logoBox"> | ||
| 12 | - <text style="color:#3f9b6a;font-weight:bold;font-size:30px;">锦江绿道</text> | ||
| 13 | - </view> | ||
| 14 | - <view class="loginTitle-text flex-column-plus flex-items font-color-666 fs26"> | ||
| 15 | - <text style="display: block;">为了给您提供更好的服务</text> | ||
| 16 | - <text style="display:block; ">我们需要您的授权哦~</text> | ||
| 17 | - </view> | ||
| 18 | - <view> | ||
| 19 | - <view class="loginBut" @click="goLogin">手机号登录</view> | ||
| 20 | - </view> | ||
| 21 | - <!-- <view class="flex-row-plus mar-top-30" style="margin-top: 30rpx;"> | ||
| 22 | - <text class="font-color-C5AA7B">还没有账号，</text> | ||
| 23 | - <text class="register-text" @click="goRegister">去注册</text> | ||
| 24 | - </view> --> | ||
| 25 | - <view style="margin-top:10px;"> | ||
| 26 | - <u-checkbox-group @change="checkboxGroupChange" shape="circle" :label-disabled="true"> | ||
| 27 | - <u-checkbox | ||
| 28 | - active-color="#3f9b6a" | ||
| 29 | - v-model="checked" | ||
| 30 | - name="tongyi" | ||
| 31 | - >我已阅读并同意<span style="color:#3f9b6a;" @click="goyinsi">《隐私政策》</span></u-checkbox> | ||
| 32 | - </u-checkbox-group> | ||
| 33 | - </view> | ||
| 34 | - </view> | ||
| 35 | - | ||
| 36 | - <view class="" v-if="denglu"> | ||
| 37 | - <!-- 填写区 --> | ||
| 38 | - <view class="input-info"> | ||
| 39 | - <view class="login-logoBox" style="margin-bottom: 20px;text-align: center;"> | ||
| 40 | - <text style="color:#3f9b6a;font-weight:bold;font-size:30px;">锦江绿道</text> | 7 | + <view style="width:60%;margin: 0 auto;"> |
| 8 | + <image src="../../static/login/logo2.png" style="width: 100%;" mode="widthFix"></image> | ||
| 41 | </view> | 9 | </view> |
| 42 | - <view class="info"> | ||
| 43 | - | ||
| 44 | - <input type="tel" maxlength="11" v-model="form.username" placeholder="请输入账号"> | ||
| 45 | - <view class="more"></view> | 10 | + <!-- 填写区 --> |
| 11 | + <view class="input-info" style="margin-top: 5vh;"> | ||
| 12 | + <view class="info"> | ||
| 13 | + <view class="info-icon"> | ||
| 14 | + <image src="../../static/login/icon1.png" mode="heightFix"></image> | ||
| 15 | + </view> | ||
| 16 | + <input type="tel" maxlength="11" v-model="phone" placeholder="请输入您的手机号"> | ||
| 17 | + <view class="more"></view> | ||
| 18 | + </view> | ||
| 19 | + <view class="info"> | ||
| 20 | + <view class="info-icon"> | ||
| 21 | + <image src="../../static/login/icon2.png" mode="heightFix"></image> | ||
| 22 | + </view> | ||
| 23 | + <input type="tel" v-model="code" maxlength="6" placeholder="请输入验证码"> | ||
| 24 | + <view class="more"> | ||
| 25 | + <text class="mo" v-if="!isTrue" @click="sendCode">获取验证码</text> | ||
| 26 | + <text class="mo" v-else>{{num}}秒后重试</text> | ||
| 27 | + </view> | ||
| 28 | + </view> | ||
| 46 | </view> | 29 | </view> |
| 47 | - | ||
| 48 | - <view class="info" > | ||
| 49 | - <input :password='!isPassword' v-model="form.password" maxlength="26" placeholder="请输入您的密码"> | ||
| 50 | - <!-- <view class="more" @click="isPassword = !isPassword"> | ||
| 51 | - <image src="../../static/login4.png"></image> | ||
| 52 | - </view> --> | 30 | + <!-- 按钮 --> |
| 31 | + <view class="btn-info"> | ||
| 32 | + <view class="btn" @click="register"> | ||
| 33 | + <text>登录</text> | ||
| 34 | + </view> | ||
| 53 | </view> | 35 | </view> |
| 36 | + | ||
| 54 | </view> | 37 | </view> |
| 55 | - <!-- 按钮 --> | ||
| 56 | - <view class="btn-info"> | ||
| 57 | - <view class="btn" @click="register"> | ||
| 58 | - <text>登录</text> | ||
| 59 | - </view> | 38 | + <view |
| 39 | + style="position: fixed;left: 0;bottom: 49rpx;display: flex;flex-direction: row;justify-content: center;width: 100%;"> | ||
| 40 | + <u-checkbox-group @change="checkboxGroupChange" shape="circle" :label-disabled="true"> | ||
| 41 | + <u-checkbox active-color="#3f9b6a" v-model="checked" name="tongyi">我已阅读并同意<span style="color:#3f9b6a;" | ||
| 42 | + @click="goyinsi">《隐私政策》</span></u-checkbox> | ||
| 43 | + </u-checkbox-group> | ||
| 60 | </view> | 44 | </view> |
| 61 | </view> | 45 | </view> |
| 62 | - | ||
| 63 | - </view> | ||
| 64 | </template> | 46 | </template> |
| 65 | 47 | ||
| 66 | <script> | 48 | <script> |
| 67 | export default { | 49 | export default { |
| 68 | data() { | 50 | data() { |
| 69 | return { | 51 | return { |
| 70 | - isLogin: false, | ||
| 71 | - isLoginWay: false, | ||
| 72 | - isPassword: false, | ||
| 73 | - denglu:false, | ||
| 74 | - // 表单 | ||
| 75 | - | ||
| 76 | - form: { | ||
| 77 | - username: '', | ||
| 78 | - password: '', | ||
| 79 | - rememberMe: false | ||
| 80 | - }, | ||
| 81 | - ischange: false, | 52 | + checked: null, |
| 53 | + phone: '', | ||
| 54 | + code: '', | ||
| 82 | isTrue: false, | 55 | isTrue: false, |
| 83 | num: 60, | 56 | num: 60, |
| 84 | time: null, | 57 | time: null, |
| 85 | - // cid | ||
| 86 | - checked:null, | ||
| 87 | - showTong:'', | ||
| 88 | - push_clientid:'' | 58 | + |
| 89 | }; | 59 | }; |
| 90 | }, | 60 | }, |
| 91 | - onShow(option) { | ||
| 92 | - console.log(option) | ||
| 93 | - | 61 | + watch: { |
| 62 | + num() { | ||
| 63 | + if (this.num == 0) { | ||
| 64 | + clearInterval(this.time) | ||
| 65 | + this.time = null | ||
| 66 | + this.isTrue = false | ||
| 67 | + this.num = 60 | ||
| 68 | + } | ||
| 69 | + } | ||
| 70 | + }, | ||
| 71 | + onShow() { | ||
| 72 | + | ||
| 94 | }, | 73 | }, |
| 95 | methods: { | 74 | methods: { |
| 96 | - goLogin(){ | ||
| 97 | - | 75 | + goyinsi() { |
| 76 | + uni.navigateTo({ | ||
| 77 | + url: '/pages/privacy/privacy' | ||
| 78 | + }); | ||
| 79 | + }, | ||
| 80 | + checkboxGroupChange(val) { | ||
| 81 | + this.showTong = val[0] | ||
| 82 | + console.log(this.showTong) | ||
| 83 | + }, | ||
| 84 | + register() { | ||
| 98 | if(this.showTong == 'tongyi'){ | 85 | if(this.showTong == 'tongyi'){ |
| 99 | - this.denglu = true | 86 | + |
| 100 | }else{ | 87 | }else{ |
| 101 | uni.showToast({ | 88 | uni.showToast({ |
| 102 | icon: 'none', | 89 | icon: 'none', |
| 103 | title: '请阅读并同意隐私政策' | 90 | title: '请阅读并同意隐私政策' |
| 104 | }) | 91 | }) |
| 92 | + return | ||
| 105 | } | 93 | } |
| 106 | - }, | ||
| 107 | - goRegister(){ | ||
| 108 | - | ||
| 109 | - }, | ||
| 110 | - goyinsi(){ | ||
| 111 | - uni.navigateTo({ | ||
| 112 | - url: '/pages/privacy/privacy' | ||
| 113 | - }); | ||
| 114 | - }, | ||
| 115 | - register() { | ||
| 116 | - if (this.form.phone == '') { | ||
| 117 | - uni.showToast({ | ||
| 118 | - icon: 'none', | ||
| 119 | - title: '请输入账号' | ||
| 120 | - }) | ||
| 121 | - return | ||
| 122 | - } | ||
| 123 | - if (this.form.password == '') { | ||
| 124 | - uni.showToast({ | ||
| 125 | - icon: 'none', | ||
| 126 | - title: '请输入密码' | ||
| 127 | - }) | ||
| 128 | - return | ||
| 129 | - } | 94 | + if (this.phone == '') { |
| 95 | + uni.showToast({ | ||
| 96 | + icon: 'none', | ||
| 97 | + title: '请输入手机号' | ||
| 98 | + }) | ||
| 99 | + return | ||
| 100 | + } | ||
| 101 | + if (this.code == '') { | ||
| 102 | + uni.showToast({ | ||
| 103 | + icon: 'none', | ||
| 104 | + title: '请输入验证码' | ||
| 105 | + }) | ||
| 106 | + return | ||
| 107 | + } | ||
| 108 | + | ||
| 130 | const data = { | 109 | const data = { |
| 131 | - // username: JM.encrypt(this.form.username), | ||
| 132 | - // password: JM.encrypt(this.form.password), | ||
| 133 | - // rememberMe: this.form.rememberMe | ||
| 134 | - | 110 | + username:this.phone, |
| 111 | + code:this.code | ||
| 135 | } | 112 | } |
| 136 | - this.$http.sendRequest('/business/login', 'POST',this.form,2).then(res => { | ||
| 137 | - if(res.data.code == ''){ | 113 | + this.$http.sendRequest('/business/login', 'POST', data, 2).then(res => { |
| 114 | + if (res.data.code == '') { | ||
| 138 | uni.setStorageSync('token', res.data.data.token); | 115 | uni.setStorageSync('token', res.data.data.token); |
| 139 | - uni.setStorageSync('shopId', res.data.data.shopId); | 116 | + uni.setStorageSync('user', res.data.data); |
| 117 | + // uni.setStorageSync('shopId', res.data.data.shopId); | ||
| 140 | uni.switchTab({ | 118 | uni.switchTab({ |
| 141 | - url: '/pages/home/home' | 119 | + url: '/pages/home/home' |
| 142 | }) | 120 | }) |
| 143 | - }else{ | 121 | + } else { |
| 144 | uni.showToast({ | 122 | uni.showToast({ |
| 145 | icon: 'none', | 123 | icon: 'none', |
| 146 | title: res.data.message | 124 | title: res.data.message |
| 147 | }) | 125 | }) |
| 148 | } | 126 | } |
| 149 | - | ||
| 150 | - | ||
| 151 | - | ||
| 152 | - }) | ||
| 153 | - }, | ||
| 154 | - change() { | ||
| 155 | - this.ischange = !this.ischange | ||
| 156 | - }, | ||
| 157 | - | ||
| 158 | - goHome(){ | ||
| 159 | - uni.switchTab({ | ||
| 160 | - url: '/pages/home/home' | 127 | + |
| 128 | + | ||
| 129 | + | ||
| 161 | }) | 130 | }) |
| 162 | }, | 131 | }, |
| 163 | - /** | ||
| 164 | - * 登录点击 | ||
| 165 | - */ | ||
| 166 | - onLogin() {}, | ||
| 167 | - checkboxGroupChange(val){ | ||
| 168 | - this.showTong = val[0] | ||
| 169 | - console.log(this.showTong) | ||
| 170 | - } | ||
| 171 | - }, | ||
| 172 | - watch: { | ||
| 173 | - form: { | ||
| 174 | - handler(newValue, oldValue) { | ||
| 175 | - // 验证码 | ||
| 176 | - if (this.isLoginWay) { | ||
| 177 | - this.isLogin = newValue.newPassword && newValue.phone ? true : false; | ||
| 178 | - } | ||
| 179 | - // 账号密码 | ||
| 180 | - if (!this.isLoginWay) { | ||
| 181 | - this.isLogin = newValue.password && newValue.phone ? true : false; | 132 | + sendCode() { |
| 133 | + if (!this.phone) { | ||
| 134 | + uni.showToast({ | ||
| 135 | + title: '请填写手机号', | ||
| 136 | + icon: 'none' | ||
| 137 | + }) | ||
| 138 | + return | ||
| 139 | + } | ||
| 140 | + this.$http.sendRequest('/business/verification', 'POST', { | ||
| 141 | + phone: this.phone | ||
| 142 | + }).then(res => { | ||
| 143 | + console.log('获取验证码', res) | ||
| 144 | + if (res.data.code == 200) { | ||
| 145 | + uni.showToast({ | ||
| 146 | + icon: 'none', | ||
| 147 | + title: '发送成功' | ||
| 148 | + }) | ||
| 149 | + if (this.num > 0) { | ||
| 150 | + this.isTrue = true | ||
| 151 | + this.time = setInterval(() => { | ||
| 152 | + this.num-- | ||
| 153 | + }, 1000) | ||
| 154 | + } else { | ||
| 155 | + this.isTrue = false | ||
| 156 | + clearInterval(this.time) | ||
| 157 | + } | ||
| 158 | + } else { | ||
| 159 | + uni.showToast({ | ||
| 160 | + icon: 'none', | ||
| 161 | + title: '请稍等再试' | ||
| 162 | + }) | ||
| 182 | } | 163 | } |
| 183 | - }, | ||
| 184 | - deep: true | 164 | + |
| 165 | + }) | ||
| 166 | + | ||
| 185 | }, | 167 | }, |
| 186 | - num() { | ||
| 187 | - if (this.num == 0) { | ||
| 188 | - clearInterval(this.time) | ||
| 189 | - this.isTrue = false | ||
| 190 | - } | ||
| 191 | - } | ||
| 192 | } | 168 | } |
| 193 | - | ||
| 194 | } | 169 | } |
| 195 | </script> | 170 | </script> |
| 196 | 171 | ||
| 197 | <style scoped lang="scss"> | 172 | <style scoped lang="scss"> |
| 198 | @import 'login.scss'; | 173 | @import 'login.scss'; |
| 199 | - .container { | ||
| 200 | - background-color: #FFFFFF; | ||
| 201 | - height: calc(100vh - 64px); | ||
| 202 | - display: flex; | ||
| 203 | - flex-direction: column; | ||
| 204 | - align-items: center; | ||
| 205 | - justify-content: center; | ||
| 206 | - .login-logoBox { | ||
| 207 | - // margin-top: -200rpx; | ||
| 208 | - | ||
| 209 | - .login-logo { | ||
| 210 | - width: 200rpx; | ||
| 211 | - height: 167rpx; | ||
| 212 | - } | ||
| 213 | - } | ||
| 214 | - | ||
| 215 | - .loginTitle-text { | ||
| 216 | - margin-top: 100rpx; | ||
| 217 | - | ||
| 218 | - } | ||
| 219 | - | ||
| 220 | - .goToHome { | ||
| 221 | - background: none; | ||
| 222 | - border: none; | ||
| 223 | - width: auto; | ||
| 224 | - margin-top: 50rpx; | ||
| 225 | - color: #999999; | ||
| 226 | - text-decoration: underline; | ||
| 227 | - | ||
| 228 | - &:after { | ||
| 229 | - display: none; | ||
| 230 | - } | ||
| 231 | - } | ||
| 232 | - | ||
| 233 | - .loginWxBut { | ||
| 234 | - background: #3f9b6a; | ||
| 235 | - color: #FFEBC4; | ||
| 236 | - height: 88rpx; | ||
| 237 | - width: 600rpx; | ||
| 238 | - text-align: center; | ||
| 239 | - line-height: 88rpx; | ||
| 240 | - margin-top: 49rpx; | ||
| 241 | - } | ||
| 242 | - | ||
| 243 | - .loginBut { | ||
| 244 | - background-color: #3f9b6a; | ||
| 245 | - color: #FFEBC4; | ||
| 246 | - height: 88rpx; | ||
| 247 | - width: 600rpx; | ||
| 248 | - text-align: center; | ||
| 249 | - line-height: 88rpx; | ||
| 250 | - margin-top: 30rpx; | ||
| 251 | - } | ||
| 252 | - | ||
| 253 | - .register-text { | ||
| 254 | - color: #C5AA7B; | ||
| 255 | - } | ||
| 256 | - .font-color-C5AA7B{ | ||
| 257 | - color: #C5AA7B; | ||
| 258 | - } | ||
| 259 | - .font-color-666{ | ||
| 260 | - color: #666666; | ||
| 261 | - font-size: 12px; | ||
| 262 | - } | ||
| 263 | - } | ||
| 264 | -</style> | ||
| 265 | - | ||
| 266 | -<style scoped> | ||
| 267 | - .loginWxBut::after { | ||
| 268 | - border-radius: 0 !important; | ||
| 269 | - } | ||
| 270 | -</style> | ||
| 271 | - | 174 | +</style> |
| 272 | \ No newline at end of file | 175 | \ No newline at end of file |
yslvdao-miniapp/pages/my/my.vue
| @@ -125,7 +125,22 @@ | @@ -125,7 +125,22 @@ | ||
| 125 | <view class="titleall-box"> | 125 | <view class="titleall-box"> |
| 126 | <view class="titleall-left"><view class="titleall-left-line"></view>我的服务</view> | 126 | <view class="titleall-left"><view class="titleall-left-line"></view>我的服务</view> |
| 127 | </view> | 127 | </view> |
| 128 | - <view class="list" @click="shopjcMsg"> | 128 | + <view class="list" @click="isshop()" v-if="!isshopon"> |
| 129 | + <view class="icon-data"> | ||
| 130 | + <view class="icon"> | ||
| 131 | + <image :src="$imgUrl('/my-icon2.png')" mode=""></image> | ||
| 132 | + </view> | ||
| 133 | + <view class="data"> | ||
| 134 | + <view class="title"> | ||
| 135 | + <text>认证商家</text> | ||
| 136 | + </view> | ||
| 137 | + </view> | ||
| 138 | + </view> | ||
| 139 | + <view class="more"> | ||
| 140 | + <image :src="$imgUrl('/right2.png')"></image> | ||
| 141 | + </view> | ||
| 142 | + </view> | ||
| 143 | + <!-- <view class="list" @click="shopjcMsg"> | ||
| 129 | <view class="icon-data"> | 144 | <view class="icon-data"> |
| 130 | <view class="icon"> | 145 | <view class="icon"> |
| 131 | <image :src="$imgUrl('/my-icon1.png')" mode=""></image> | 146 | <image :src="$imgUrl('/my-icon1.png')" mode=""></image> |
| @@ -139,7 +154,7 @@ | @@ -139,7 +154,7 @@ | ||
| 139 | <view class="more"> | 154 | <view class="more"> |
| 140 | <image :src="$imgUrl('/right2.png')"></image> | 155 | <image :src="$imgUrl('/right2.png')"></image> |
| 141 | </view> | 156 | </view> |
| 142 | - </view> | 157 | + </view> --> |
| 143 | <view class="list" @click="toPage('/pages/record/record')"> | 158 | <view class="list" @click="toPage('/pages/record/record')"> |
| 144 | <view class="icon-data"> | 159 | <view class="icon-data"> |
| 145 | <view class="icon"> | 160 | <view class="icon"> |
| @@ -244,7 +259,9 @@ | @@ -244,7 +259,9 @@ | ||
| 244 | tuiguang:'', | 259 | tuiguang:'', |
| 245 | tongji:{}, | 260 | tongji:{}, |
| 246 | activityNum:0, | 261 | activityNum:0, |
| 247 | - wenjuanNum:0 | 262 | + wenjuanNum:0, |
| 263 | + user: uni.getStorageSync('user'), | ||
| 264 | + isshopon: false | ||
| 248 | }; | 265 | }; |
| 249 | }, | 266 | }, |
| 250 | onload(){ | 267 | onload(){ |
| @@ -376,44 +393,7 @@ | @@ -376,44 +393,7 @@ | ||
| 376 | } | 393 | } |
| 377 | 394 | ||
| 378 | }, | 395 | }, |
| 379 | - handleApplySettle() { | ||
| 380 | - // uni.navigateTo({ | ||
| 381 | - // url: '/pages/myzili/myzili' | ||
| 382 | - // }) | ||
| 383 | - const res = uni.getStorageSync('token'); | ||
| 384 | - let token = Encrypt(res) | ||
| 385 | - let username = this.shopMsg.shopName | ||
| 386 | - // let url = 'http://8.130.38.56:8027/settled-merchant' | ||
| 387 | - let url = 'https://jy.scjysm.asia:18086/settled-merchant' | ||
| 388 | - | ||
| 389 | - // #ifdef H5 | ||
| 390 | - console.log('h5 test') | ||
| 391 | - window.location.href = url + `/#/?username=${ username }&user=${ token }` | ||
| 392 | - // #endif | ||
| 393 | - // #ifdef APP-PLUS | ||
| 394 | - plus.runtime.openURL(url + `/#/?username=${ username }&user=${ token }`, function( | ||
| 395 | - e) { | ||
| 396 | - console.log(e); | ||
| 397 | - }) | ||
| 398 | - // #endif | ||
| 399 | - // #ifdef MP-WEIXIN | ||
| 400 | - uni.navigateTo({ | ||
| 401 | - url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }` | ||
| 402 | - // 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址 | ||
| 403 | - // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url) | ||
| 404 | - // url:'../../../pages_category_page2/userModule/coupon' | ||
| 405 | - }) | ||
| 406 | - // #endif | ||
| 407 | - // #ifdef MP-ALIPAY | ||
| 408 | - uni.navigateTo({ | ||
| 409 | - url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }` | ||
| 410 | - // 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址 | ||
| 411 | - // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url) | ||
| 412 | - // url:'../../../pages_category_page2/userModule/coupon' | ||
| 413 | - }) | ||
| 414 | - // #endif | ||
| 415 | - | ||
| 416 | - }, | 396 | + |
| 417 | myMsg(){ | 397 | myMsg(){ |
| 418 | const res = uni.getStorageSync('token'); | 398 | const res = uni.getStorageSync('token'); |
| 419 | if(res ==''){ | 399 | if(res ==''){ |
yslvdao-miniapp/pages/shops/shops.vue
| @@ -29,12 +29,12 @@ | @@ -29,12 +29,12 @@ | ||
| 29 | <view class="goods-list"> | 29 | <view class="goods-list"> |
| 30 | <view class="list" v-for="(item,index) in tableData" :key="index" @click="reconciliationdetail(item)"> | 30 | <view class="list" v-for="(item,index) in tableData" :key="index" @click="reconciliationdetail(item)"> |
| 31 | <view class="thumb"> | 31 | <view class="thumb"> |
| 32 | - <u-image width="25vw" height="25vw" :src="item.displayMainImage"></u-image> | 32 | + <u-image width="25vw" height="25vw" :src="item.cereBasicInformationShop.displayMainImage"></u-image> |
| 33 | <!-- <image :src="item.displayMainImage" mode=""></image> --> | 33 | <!-- <image :src="item.displayMainImage" mode=""></image> --> |
| 34 | </view> | 34 | </view> |
| 35 | <view class="item"> | 35 | <view class="item"> |
| 36 | <view class="title"> | 36 | <view class="title"> |
| 37 | - <text class="one-omit">{{item.shopName}}</text> | 37 | + <text class="one-omit">{{item.cereBasicInformationShop.shopName}}</text> |
| 38 | </view> | 38 | </view> |
| 39 | <view class="tag"> | 39 | <view class="tag"> |
| 40 | <!-- <text>标签标签</text> | 40 | <!-- <text>标签标签</text> |
| @@ -42,17 +42,18 @@ | @@ -42,17 +42,18 @@ | ||
| 42 | </view> | 42 | </view> |
| 43 | <view class="introduce"> | 43 | <view class="introduce"> |
| 44 | <image :src="$imgUrl('/kefu.png')"></image> | 44 | <image :src="$imgUrl('/kefu.png')"></image> |
| 45 | - <text class="one-omit">{{item.detailedLocation}}</text> | 45 | + <text class="one-omit">{{item.cereBasicInformationShop.detailedLocation}}</text> |
| 46 | </view> | 46 | </view> |
| 47 | <view class="like-goods"> | 47 | <view class="like-goods"> |
| 48 | <view class="retail-price"> | 48 | <view class="retail-price"> |
| 49 | <text>租金:</text> | 49 | <text>租金:</text> |
| 50 | <text class="min">￥</text> | 50 | <text class="min">￥</text> |
| 51 | - <text class="max">{{item.id * 10}}</text> | ||
| 52 | - <text class="min">/月</text> | 51 | + |
| 52 | + <text class="max">{{item.cereReleasePoliciesVO[0]?item.cereReleasePoliciesVO[0].rentalPrice:0}}</text> | ||
| 53 | + <text class="min">{{item.cereReleasePoliciesVO[0]?item.cereReleasePoliciesVO[0].leaseTerm:'月'}}</text> | ||
| 53 | <text class="line"></text> | 54 | <text class="line"></text> |
| 54 | <text>面积:</text> | 55 | <text>面积:</text> |
| 55 | - <text class="max">{{item.actualUsableArea}}</text> | 56 | + <text class="max">{{item.cereBasicInformationShop.actualUsableArea}}</text> |
| 56 | <text class="min">/m²</text> | 57 | <text class="min">/m²</text> |
| 57 | </view> | 58 | </view> |
| 58 | </view> | 59 | </view> |
| @@ -128,8 +129,10 @@ | @@ -128,8 +129,10 @@ | ||
| 128 | query: { | 129 | query: { |
| 129 | shopName:'', | 130 | shopName:'', |
| 130 | belongingRegion: '', | 131 | belongingRegion: '', |
| 132 | + resourceType:'商铺', | ||
| 131 | pageNumber: 1, | 133 | pageNumber: 1, |
| 132 | pageSize: 10 , | 134 | pageSize: 10 , |
| 135 | + dataForm:'2' | ||
| 133 | }, | 136 | }, |
| 134 | pageindex: { | 137 | pageindex: { |
| 135 | pageNumber: 1, | 138 | pageNumber: 1, |
| @@ -194,7 +197,7 @@ | @@ -194,7 +197,7 @@ | ||
| 194 | //请求列表数据 | 197 | //请求列表数据 |
| 195 | getAll() { | 198 | getAll() { |
| 196 | let query = Object.assign(this.query, this.pageindex); | 199 | let query = Object.assign(this.query, this.pageindex); |
| 197 | - this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', query, 1).then(res => { | 200 | + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', query, 1).then(res => { |
| 198 | //成功回调 | 201 | //成功回调 |
| 199 | this.tableData = res.data.data.content | 202 | this.tableData = res.data.data.content |
| 200 | }).catch(err => { | 203 | }).catch(err => { |
| @@ -204,7 +207,7 @@ | @@ -204,7 +207,7 @@ | ||
| 204 | }, | 207 | }, |
| 205 | // 查询 | 208 | // 查询 |
| 206 | search() { | 209 | search() { |
| 207 | - this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.query, 1).then(res => { | 210 | + this.$http.sendRequest('/cereReleaseInvestmentResources/queryByPage', 'POST', this.query, 1).then(res => { |
| 208 | //成功回调 | 211 | //成功回调 |
| 209 | this.tableData = res.data.data.content | 212 | this.tableData = res.data.data.content |
| 210 | }) | 213 | }) |
| @@ -214,9 +217,10 @@ | @@ -214,9 +217,10 @@ | ||
| 214 | this.search(); | 217 | this.search(); |
| 215 | }, | 218 | }, |
| 216 | reconciliationdetail(item) { | 219 | reconciliationdetail(item) { |
| 217 | - let items = JSON.stringify(item) | 220 | + let items = JSON.stringify(item.cereBasicInformationShop) |
| 221 | + let celue = JSON.stringify(item.cereReleasePoliciesVO) | ||
| 218 | uni.navigateTo({ | 222 | uni.navigateTo({ |
| 219 | - url: `/pages/details/details?item=${items}` | 223 | + url: `/pages/details/details?item=${items}&celue=${celue}` |
| 220 | }) | 224 | }) |
| 221 | }, | 225 | }, |
| 222 | 226 |
yslvdao-miniapp/pages/workbench/workbench.vue
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | </view> | 43 | </view> |
| 44 | </view> | 44 | </view> |
| 45 | </view> | 45 | </view> |
| 46 | - <view class="main"> | 46 | + <!-- <view class="main"> |
| 47 | <view class="bg-white" v-for="item in pageList3" :key="item.id"> | 47 | <view class="bg-white" v-for="item in pageList3" :key="item.id"> |
| 48 | <view class="bidding-title"><view class="bidding-title-line"></view>{{item.title}}</view> | 48 | <view class="bidding-title"><view class="bidding-title-line"></view>{{item.title}}</view> |
| 49 | <view class="wallet-info"> | 49 | <view class="wallet-info"> |
| @@ -57,7 +57,7 @@ | @@ -57,7 +57,7 @@ | ||
| 57 | </view> | 57 | </view> |
| 58 | </view> | 58 | </view> |
| 59 | </view> | 59 | </view> |
| 60 | - </view> | 60 | + </view> --> |
| 61 | <!-- tabbar --> | 61 | <!-- tabbar --> |
| 62 | <tabbar :tabBarShow="1"></tabbar> | 62 | <tabbar :tabBarShow="1"></tabbar> |
| 63 | </view> | 63 | </view> |
| @@ -127,20 +127,20 @@ | @@ -127,20 +127,20 @@ | ||
| 127 | ] | 127 | ] |
| 128 | }, | 128 | }, |
| 129 | ], | 129 | ], |
| 130 | - pageList3: [ | ||
| 131 | - { | ||
| 132 | - id: 1, | ||
| 133 | - title: '销售上报与统计', | ||
| 134 | - children: [ | ||
| 135 | - // { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' }, | ||
| 136 | - // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, | ||
| 137 | - // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' }, | ||
| 138 | - // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' }, | ||
| 139 | - { name: '销售上报', img: '/workbench5.png', path: '/pages/saleReport/saleReport' }, | ||
| 140 | - { name: '销售统计', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' }, | ||
| 141 | - ] | ||
| 142 | - }, | ||
| 143 | - ], | 130 | + // pageList3: [ |
| 131 | + // { | ||
| 132 | + // id: 1, | ||
| 133 | + // title: '销售上报与统计', | ||
| 134 | + // children: [ | ||
| 135 | + // // { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' }, | ||
| 136 | + // // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, | ||
| 137 | + // // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' }, | ||
| 138 | + // // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' }, | ||
| 139 | + // { name: '销售上报', img: '/workbench5.png', path: '/pages/saleReport/saleReport' }, | ||
| 140 | + // { name: '销售统计', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' }, | ||
| 141 | + // ] | ||
| 142 | + // }, | ||
| 143 | + // ], | ||
| 144 | scrollTop: 0, | 144 | scrollTop: 0, |
| 145 | }; | 145 | }; |
| 146 | }, | 146 | }, |
yslvdao-miniapp/pagesA/leaseAdd/leaseAdd.scss
0 → 100644
| 1 | +.page{ | ||
| 2 | + position: absolute; | ||
| 3 | + left: 0; | ||
| 4 | + top: 0; | ||
| 5 | + width: 100%; | ||
| 6 | + overflow-y: scroll; | ||
| 7 | + height: calc(100% - 120rpx); | ||
| 8 | + background-color: #f6f6f6; | ||
| 9 | +} | ||
| 10 | +.steps-box { | ||
| 11 | + padding-top: 40rpx; | ||
| 12 | +} | ||
| 13 | + | ||
| 14 | +.add-list{ | ||
| 15 | + padding: 0 4%; | ||
| 16 | + background-color: #FFFFFF; | ||
| 17 | + border-radius: 20rpx; | ||
| 18 | + margin-top: 20rpx; | ||
| 19 | + width: 100%; | ||
| 20 | + .list{ | ||
| 21 | + display: flex; | ||
| 22 | + justify-content: space-between; | ||
| 23 | + align-items: center; | ||
| 24 | + width: 100%; | ||
| 25 | + height: 100rpx; | ||
| 26 | + border-bottom: 2rpx solid #f6f6f6; | ||
| 27 | + .title{ | ||
| 28 | + display: flex; | ||
| 29 | + align-items: center; | ||
| 30 | + height: 100%; | ||
| 31 | + text{ | ||
| 32 | + font-size: 26rpx; | ||
| 33 | + color: #222222; | ||
| 34 | + } | ||
| 35 | + .star{ | ||
| 36 | + color: red; | ||
| 37 | + } | ||
| 38 | + } | ||
| 39 | + .content{ | ||
| 40 | + display: flex; | ||
| 41 | + align-items: center; | ||
| 42 | + text-align: right; | ||
| 43 | + input{ | ||
| 44 | + width: 100%; | ||
| 45 | + color: #222222; | ||
| 46 | + font-size: 26rpx; | ||
| 47 | + padding-top: 6rpx; | ||
| 48 | + /* #ifdef MP */ | ||
| 49 | + padding-top: 5rpx; | ||
| 50 | + /* #endif */ | ||
| 51 | + } | ||
| 52 | + image { | ||
| 53 | + width: 20rpx; | ||
| 54 | + height: 20rpx; | ||
| 55 | + margin-left: 10rpx; | ||
| 56 | + /* #ifdef MP */ | ||
| 57 | + margin-top: 5rpx; | ||
| 58 | + /* #endif */ | ||
| 59 | + } | ||
| 60 | + } | ||
| 61 | + } | ||
| 62 | + .deom-box { | ||
| 63 | + width: 100vw; | ||
| 64 | + display: flex !important; | ||
| 65 | + padding: 14rpx 0; | ||
| 66 | + background-color: #FFFFFF; | ||
| 67 | + border-radius: 9px; | ||
| 68 | + // margin-top: 9px; | ||
| 69 | + width: 100%; | ||
| 70 | + // .u-upload { | ||
| 71 | + // .u-add-wrap { | ||
| 72 | + // width: 304rpx !important; | ||
| 73 | + // height: 182rpx !important; | ||
| 74 | + // } | ||
| 75 | + // } | ||
| 76 | + // .u-upload { | ||
| 77 | + // height: 88px; | ||
| 78 | + // width: 155px; | ||
| 79 | + // background: url(/static/images/uploadID1.png); | ||
| 80 | + // background-size:134rpx 188rpx; | ||
| 81 | + // background-repeat:no-repeat; | ||
| 82 | + // } | ||
| 83 | + .img-deom { | ||
| 84 | + flex: 1; | ||
| 85 | + display: flex; | ||
| 86 | + flex-direction: column; | ||
| 87 | + align-items: center; | ||
| 88 | + padding: 20rpx; | ||
| 89 | + text { | ||
| 90 | + margin-top: 18rpx; | ||
| 91 | + } | ||
| 92 | + } | ||
| 93 | + } | ||
| 94 | +} | ||
| 95 | + | ||
| 96 | +/* 保存按钮 */ | ||
| 97 | +.page-footer{ | ||
| 98 | + position: fixed; | ||
| 99 | + left: 0; | ||
| 100 | + bottom: 0; | ||
| 101 | + display: flex; | ||
| 102 | + align-items: center; | ||
| 103 | + width: 100%; | ||
| 104 | + height: 125rpx; | ||
| 105 | + background-color: #FFFFFF; | ||
| 106 | + padding-bottom: constant(safe-area-inset-bottom); | ||
| 107 | + padding-bottom: env(safe-area-inset-bottom); | ||
| 108 | + .footer-buy{ | ||
| 109 | + display: flex; | ||
| 110 | + align-items: center; | ||
| 111 | + justify-content: space-between; | ||
| 112 | + width: 100%; | ||
| 113 | + height: 100%; | ||
| 114 | + .cart-add{ | ||
| 115 | + display: flex; | ||
| 116 | + align-items: center; | ||
| 117 | + justify-content: center; | ||
| 118 | + width: 100%; | ||
| 119 | + height: 100rpx; | ||
| 120 | + background-color: #3f9b6a; | ||
| 121 | + text{ | ||
| 122 | + font-size: 28rpx; | ||
| 123 | + color: #FFFFFF; | ||
| 124 | + } | ||
| 125 | + } | ||
| 126 | + } | ||
| 127 | +} | ||
| 128 | + | ||
| 129 | +.feedback-data{ | ||
| 130 | + width: 100%; | ||
| 131 | + padding-bottom: 20rpx; | ||
| 132 | + border-bottom: 2rpx solid #f6f6f6; | ||
| 133 | + .title{ | ||
| 134 | + display: flex; | ||
| 135 | + align-items: center; | ||
| 136 | + height: 100rpx; | ||
| 137 | + text{ | ||
| 138 | + font-size: 26rpx; | ||
| 139 | + color: #222222; | ||
| 140 | + } | ||
| 141 | + .star{ | ||
| 142 | + color: red; | ||
| 143 | + } | ||
| 144 | + } | ||
| 145 | + .voucher-img{ | ||
| 146 | + display: flex; | ||
| 147 | + align-items: center; | ||
| 148 | + .voucher-list { | ||
| 149 | + width: 33%; | ||
| 150 | + height: 100%; | ||
| 151 | + image{ | ||
| 152 | + width: 160rpx; | ||
| 153 | + height: 160rpx; | ||
| 154 | + border-radius: 10rpx; | ||
| 155 | + } | ||
| 156 | + } | ||
| 157 | + } | ||
| 158 | +} | ||
| 0 | \ No newline at end of file | 159 | \ No newline at end of file |
yslvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <view class="page"> | ||
| 3 | + <view> | ||
| 4 | + <u-form labelPosition="left" :model="model1" ref="uForm" :labelWidth="250"> | ||
| 5 | + <view class="add-list"> | ||
| 6 | + <u-form-item label="经营者姓名" prop="name" borderBottom> | ||
| 7 | + <u-input v-model="model1.name"></u-input> | ||
| 8 | + </u-form-item> | ||
| 9 | + <!-- <u-form-item label="手机号" prop="phone" borderBottom> | ||
| 10 | + <u-input v-model="model1.phone"></u-input> | ||
| 11 | + </u-form-item> --> | ||
| 12 | + <u-form-item label="证件类型" prop="idCardType" borderBottom> | ||
| 13 | + <u-input v-model="model1.idCardType" type="select" @click="IdtypeShow = true" | ||
| 14 | + placeholder='请选择类型' /> | ||
| 15 | + </u-form-item> | ||
| 16 | + <u-form-item label="身份证号码" prop="idCardNumber" borderBottom> | ||
| 17 | + <u-input v-model="model1.idCardNumber"></u-input> | ||
| 18 | + </u-form-item> | ||
| 19 | + </view> | ||
| 20 | + <view class="add-list"> | ||
| 21 | + <view class="deom-box"> | ||
| 22 | + <view class="img-deom"> | ||
| 23 | + <u-upload :action="url" @on-choose-complete="onsuccess1" :auto-upload="false" | ||
| 24 | + :custom-btn="true" :max-count="1" ref="idPhotoFront"> | ||
| 25 | + <view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" | ||
| 26 | + hover-stay-time="150"> | ||
| 27 | + <u-image width="304rpx" height="182rpx" :src="$imgUrl('/uploadID1.png')"></u-image> | ||
| 28 | + </view> | ||
| 29 | + </u-upload> | ||
| 30 | + <text>点击上传证件人像面</text> | ||
| 31 | + </view> | ||
| 32 | + <view class="img-deom"> | ||
| 33 | + <u-upload :action="url" @on-choose-complete="onsuccess2" :auto-upload="false" :custom-btn="true" :max-count="1" | ||
| 34 | + ref="idPhotoBack"> | ||
| 35 | + <view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" | ||
| 36 | + hover-stay-time="150"> | ||
| 37 | + <u-image width="304rpx" height="182rpx" :src="$imgUrl('/uploadID2.png')"></u-image> | ||
| 38 | + </view> | ||
| 39 | + </u-upload> | ||
| 40 | + <text>点击上传证件国徽面</text> | ||
| 41 | + </view> | ||
| 42 | + </view> | ||
| 43 | + </view> | ||
| 44 | + <view class="add-list"> | ||
| 45 | + <view style="line-height: 60rpx;">上传示例</view> | ||
| 46 | + <view class="deom-box"> | ||
| 47 | + <view class="img-deom"> | ||
| 48 | + <u-image width="304rpx" height="182rpx" :src="$imgUrl('/front-icon.png')"></u-image> | ||
| 49 | + <text>人脸示例图</text> | ||
| 50 | + </view> | ||
| 51 | + <view class="img-deom"> | ||
| 52 | + <u-image width="304rpx" height="182rpx" :src="$imgUrl('/back-icon.png')"></u-image> | ||
| 53 | + <text>国徽面示例图</text> | ||
| 54 | + </view> | ||
| 55 | + </view> | ||
| 56 | + </view> | ||
| 57 | + <text | ||
| 58 | + style="display: inline-block; font-size: 24rpx; line-height: 30px; margin: 24rpx 30rpx 0;">请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。</text> | ||
| 59 | + </u-form> | ||
| 60 | + </view> | ||
| 61 | + <u-select v-model="IdtypeShow" :list="idType" @confirm="IdtypeChange"></u-select> | ||
| 62 | + <!-- 保存按钮 --> | ||
| 63 | + <view class="page-footer"> | ||
| 64 | + <u-button type="success" style="flex: 1; margin: 0 10px;" @click="go">提交申请</u-button> | ||
| 65 | + </view> | ||
| 66 | + </view> | ||
| 67 | +</template> | ||
| 68 | + | ||
| 69 | +<script> | ||
| 70 | + export default { | ||
| 71 | + data() { | ||
| 72 | + return { | ||
| 73 | + url: 'http://8.130.38.56:9003/file/upload', | ||
| 74 | + model1: { | ||
| 75 | + name: '', | ||
| 76 | + phone: '', | ||
| 77 | + idCardType: '', | ||
| 78 | + idCardNumber: '', | ||
| 79 | + idCardFrontImage: '', | ||
| 80 | + idCardBackImage: '', | ||
| 81 | + checkState: '1', | ||
| 82 | + applyTime: '' | ||
| 83 | + }, | ||
| 84 | + idType: [{ | ||
| 85 | + value: 1, | ||
| 86 | + label: '身份证' | ||
| 87 | + }, ], | ||
| 88 | + IdtypeShow: false, | ||
| 89 | + fileList1: [], | ||
| 90 | + fileList2: [], | ||
| 91 | + }; | ||
| 92 | + }, | ||
| 93 | + onLoad() { | ||
| 94 | + | ||
| 95 | + }, | ||
| 96 | + onShow() { | ||
| 97 | + | ||
| 98 | + | ||
| 99 | + }, | ||
| 100 | + methods: { | ||
| 101 | + getCurrentTime() { | ||
| 102 | + const now = new Date(); | ||
| 103 | + const year = now.getFullYear(); | ||
| 104 | + const month = ('0' + (now.getMonth() + 1)).slice(-2); | ||
| 105 | + const day = ('0' + now.getDate()).slice(-2); | ||
| 106 | + const hours = ('0' + now.getHours()).slice(-2); | ||
| 107 | + const minutes = ('0' + now.getMinutes()).slice(-2); | ||
| 108 | + const seconds = ('0' + now.getSeconds()).slice(-2); | ||
| 109 | + | ||
| 110 | + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; | ||
| 111 | + }, | ||
| 112 | + go() { | ||
| 113 | + console.error(this.fileList1) | ||
| 114 | + console.error(this.fileList2) | ||
| 115 | + | ||
| 116 | + this.model1.applyTime = this.getCurrentTime() | ||
| 117 | + this.model1.idCardFrontImage = this.fileList1.join(',') | ||
| 118 | + this.model1.idCardBackImage = this.fileList2.join(',') | ||
| 119 | + this.model1.username = this.model1.name | ||
| 120 | + this.model1.phone = uni.getStorageSync('user').phone | ||
| 121 | + console.error({ | ||
| 122 | + ...this.model1 | ||
| 123 | + }) | ||
| 124 | + // return | ||
| 125 | + this.$http.sendRequest('/cerePlatformMerchant/add', 'POST', this.model1, 2).then(res => { | ||
| 126 | + console.error(res) | ||
| 127 | + if (res.data.code) { | ||
| 128 | + uni.showToast({ | ||
| 129 | + icon: 'none', | ||
| 130 | + title: '提交申请成功' | ||
| 131 | + }) | ||
| 132 | + setTimeout(() => { | ||
| 133 | + uni.navigateBack() | ||
| 134 | + }, 1000); | ||
| 135 | + } else { | ||
| 136 | + uni.showToast({ | ||
| 137 | + icon: 'none', | ||
| 138 | + title: '提交申请失败' | ||
| 139 | + }) | ||
| 140 | + } | ||
| 141 | + }) | ||
| 142 | + }, | ||
| 143 | + onup(e,e1) { | ||
| 144 | + uni.uploadFile({ | ||
| 145 | + url: this.$upload, // 仅为示例，请替换为您的服务器上传接口 | ||
| 146 | + filePath: e, | ||
| 147 | + name: 'file', // 后端接收的文件参数名 | ||
| 148 | + formData: { | ||
| 149 | + filePath: 'xcx', // 其他表单数据 | ||
| 150 | + }, | ||
| 151 | + success: (uploadFileRes) => { | ||
| 152 | + console.log('上传成功', uploadFileRes); | ||
| 153 | + uni.showToast({ | ||
| 154 | + title: '上传成功', | ||
| 155 | + icon: 'success', | ||
| 156 | + }); | ||
| 157 | + this[e1].push(JSON.parse(uploadFileRes.data).data) | ||
| 158 | + }, | ||
| 159 | + fail: (err) => { | ||
| 160 | + console.error('上传失败', err); | ||
| 161 | + uni.showToast({ | ||
| 162 | + title: '上传失败', | ||
| 163 | + icon: 'none', | ||
| 164 | + }); | ||
| 165 | + }, | ||
| 166 | + }); | ||
| 167 | + }, | ||
| 168 | + onsuccess1(e) { | ||
| 169 | + console.error(e) | ||
| 170 | + this.fileList1 = [] | ||
| 171 | + this.onup(e[0].url,'fileList1') | ||
| 172 | + }, | ||
| 173 | + onsuccess2(e) { | ||
| 174 | + console.error(e) | ||
| 175 | + this.fileList2 = [] | ||
| 176 | + this.onup(e[0].url,'fileList2') | ||
| 177 | + | ||
| 178 | + }, | ||
| 179 | + IdtypeChange(e) { | ||
| 180 | + this.model1.idCardType = e[0].label; | ||
| 181 | + }, | ||
| 182 | + } | ||
| 183 | + } | ||
| 184 | +</script> | ||
| 185 | + | ||
| 186 | +<style scoped lang="scss"> | ||
| 187 | + @import 'leaseAdd.scss'; | ||
| 188 | +</style> | ||
| 0 | \ No newline at end of file | 189 | \ No newline at end of file |
yslvdao-miniapp/static/login/icon1.png
0 → 100644
450 Bytes
yslvdao-miniapp/static/login/icon2.png
0 → 100644
408 Bytes
yslvdao-miniapp/static/login/icon3.png
0 → 100644
335 Bytes
yslvdao-miniapp/static/login/logo1.png
0 → 100644
18.8 KB
yslvdao-miniapp/static/login/logo2.png
0 → 100644
6.39 KB
yslvdao-miniapp/utils/request.js
| @@ -16,13 +16,13 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | @@ -16,13 +16,13 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | ||
| 16 | if(baseUrl == 1){ | 16 | if(baseUrl == 1){ |
| 17 | bases = 'https://jy.scjysm.asia:18086/admin-server' + url; | 17 | bases = 'https://jy.scjysm.asia:18086/admin-server' + url; |
| 18 | // bases = 'http://8.130.38.56:8027/admin-server' + url; | 18 | // bases = 'http://8.130.38.56:8027/admin-server' + url; |
| 19 | - // bases = 'http://192.168.2.193' + url; | 19 | + // bases = 'http://192.168.2.193:9003' + url; |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | }else{ | 22 | }else{ |
| 23 | // bases = 'http://8.130.38.56:8027/business-server' + url; | 23 | // bases = 'http://8.130.38.56:8027/business-server' + url; |
| 24 | - // bases = 'http://172.16.61.48/business-server' + url; | ||
| 25 | - bases = 'https://jy.scjysm.asia:18086/merchant-business' + url; | 24 | + bases = 'http://192.168.8.106:9004' + url; |
| 25 | + // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url; | ||
| 26 | 26 | ||
| 27 | } | 27 | } |
| 28 | var token = uni.getStorageSync('token') || ''; | 28 | var token = uni.getStorageSync('token') || ''; |