webapp / GreenwayWeb

Commit 73551aa99621ac49b0b761381829d15326fb0a76

Authored by wesley88
2 parents 523cfe19 0ecc64b9

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 72 changed files with 858 additions and 593 deletions
admin-web-master/src/components/Tinymce/components/EditorImage.vue
  View file @73551aa
... ... @@ -12,7 +12,7 @@
12 12 :on-success="handleSuccess"
13 13 :before-upload="beforeUpload"
14 14 class="editor-slide-upload"
15   - action="https://httpbin.org/post"
  15 + :action="action"
16 16 list-type="picture-card"
17 17 >
18 18 <el-button size="small" type="primary">
... ... @@ -30,7 +30,7 @@
30 30 </template>
31 31  
32 32 <script>
33   -// import { getToken } from 'api/qiniu'
  33 +import { upUrl } from '@/utils/request'
34 34  
35 35 export default {
36 36 name: 'EditorSlideUpload',
... ... @@ -44,7 +44,8 @@ export default {
44 44 return {
45 45 dialogVisible: false,
46 46 listObj: {},
47   - fileList: []
  47 + fileList: [],
  48 + action:upUrl
48 49 }
49 50 },
50 51 methods: {
... ... @@ -67,7 +68,7 @@ export default {
67 68 const objKeyArr = Object.keys(this.listObj)
68 69 for (let i = 0, len = objKeyArr.length; i < len; i++) {
69 70 if (this.listObj[objKeyArr[i]].uid === uid) {
70   - this.listObj[objKeyArr[i]].url = response.files.file
  71 + this.listObj[objKeyArr[i]].url = this.$baseURL+response.files.file
71 72 this.listObj[objKeyArr[i]].hasSuccess = true
72 73 return
73 74 }
... ...
admin-web-master/src/main.js
  View file @73551aa
... ... @@ -38,7 +38,7 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd
38 38  
39 39  
40 40 let host = window.location.host;
41   -if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' ) {
  41 +if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
42 42 Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
43 43 Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
44 44 Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
... ...
admin-web-master/src/utils/request.js
  View file @73551aa
... ... @@ -17,9 +17,15 @@ let baseURL = &#39;&#39;
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19 19 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
20   - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
21 21 // baseURL = 'http://172.16.61.125:9003';
  22 +
  23 + // baseURL = 'http://192.168.2.107:9003';
  24 +
  25 + baseURL = 'http://192.168.2.138:9003';
  26 +
22 27 // baseURL = 'http://10.0.0.51:9003';
  28 +
23 29 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
24 30 // baseURL = 'http://192.168.2.225:9003';
25 31  
... ... @@ -43,6 +49,7 @@ const service = axios.create({
43 49 })
44 50 // export const upurl = baseURL
45 51 export const uploadUrl = `${baseURL}/miniio/upload`
  52 +export const upUrl = `${baseURL}/miniio/uploadQuestion`
46 53 export const token = getToken()
47 54  
48 55 // request interceptor
... ...
admin-web-master/src/views/comment/commentSys/index.vue
  View file @73551aa
... ... @@ -102,7 +102,7 @@
102 102 <el-image
103 103 v-for="(item,index) in commentDetails.images"
104 104 :key="index"
105   - :src="item"
  105 + :src="$baseURL+item"
106 106 :preview-src-list="commentDetails.images"
107 107 />
108 108 </div>
... ...
admin-web-master/src/views/member/memberList/details.vue
  View file @73551aa
1 1 <template>
2   - <el-dialog title="详情" width="70%" :visible.sync="visible" :close-on-click-modal="false" @close="closeModalDetail">
  2 + <div style="">
  3 + <div style="height:58px;line-height:58px;background-color: #fff;padding: 0 10px;">
  4 + <div style="color:#0006"> <span>会员管理</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">会员详情</span></div>
  5 + </div>
3 6 <div class="custom_info_page">
4   - <h2>客户信息</h2>
  7 +
  8 + <TitleWithCircle title="客户信息" style="margin-bottom: 15px;"/>
5 9 <div class="custom_info">
6 10 <div class="info_item">
7 11 <img :src="userObj.headImage" alt>
... ... @@ -18,14 +22,14 @@
18 22 </div>
19 23 </div>
20 24 <div class="custom_tag">
21   - <h2>客户标签</h2>
  25 + <TitleWithCircle title="客户标签" style="margin-bottom: 15px;"/>
22 26 <div class="Tag">
23 27 <p v-for="(item, index) in tagList" :key="index">{{ item.tagName }}</p>
24 28 <p @click="addTag">贴标签</p>
25 29 </div>
26 30 </div>
27 31 <div class="custom_data">
28   - <h2>消费数据</h2>
  32 + <TitleWithCircle title="消费数据" style="margin-bottom: 15px;"/>
29 33 <div class="data_list">
30 34 <p>
31 35 <span>
... ... @@ -102,9 +106,7 @@
102 106 <div v-if="componentName === 'addressInfo'">
103 107 <el-table
104 108 :data="userObj.receives"
105   - border
106   - :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
107   - style="width: 100%"
  109 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
108 110 >
109 111 <el-table-column prop="receiveName" label="姓名" />
110 112 <el-table-column prop="receivePhone" label="电话" />
... ... @@ -204,19 +206,32 @@
204 206 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="delCom">删除</el-button>
205 207 </span>
206 208 </el-dialog>
207   - </div>
208   - <div slot="footer" class="dialog-footer">
  209 + <div style="margin-top: 10px;">
209 210 <el-button class="buttonHover"
210 211 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="doCancel">取消</el-button>
211   - <el-button style="background-color: #3F9B6A;color: #fff" @click="doSubmit">确认</el-button>
  212 + <!-- <el-button style="background-color: #3F9B6A;color: #fff" @click="doSubmit">确认</el-button> -->
212 213 </div>
213   - </el-dialog>
  214 + </div>
  215 +
  216 + </div>
214 217 </template>
215 218  
216 219 <script>
217 220 import { customerMageGetById, getLabels, customerSaveUserLabel } from '@/api/customerMage'
218 221 import { commentSysGetById, commentSysUpdate, commentSysDelete, commentAllow } from '@/api/comment'
  222 +import TitleWithCircle from '@/components/top/index';
219 223 export default {
  224 + components: {
  225 + TitleWithCircle
  226 + },
  227 + props: {
  228 + // 声明接收的数据
  229 + message: {
  230 + type: Object, // 指定数据的类型
  231 + required: true, // 指定该数据是必需的
  232 + default: {}// 指定默认值
  233 + }
  234 + },
220 235 data () {
221 236 return {
222 237 visible: false,
... ... @@ -253,11 +268,9 @@ export default {
253 268 comState: 1 // 是否隐藏 1-是 0-否
254 269 }
255 270 },
256   - // created () {
257   - // this.user = this.$route.params
258   - // console.log(this.user)
259   - // this.getUser(this.user)
260   - // },
  271 + mounted () {
  272 + this.getUser(this.message)
  273 + },
261 274 methods: {
262 275 // 允许展示
263 276 async toShow () {
... ... @@ -378,6 +391,7 @@ export default {
378 391 },
379 392 doCancel () {
380 393 this.visible = false
  394 + this.$emit('childMessage', this.visible);
381 395 },
382 396 doSubmit () {
383 397 this.visible = false
... ... @@ -462,8 +476,7 @@ h2 {
462 476 }
463 477 }
464 478 .custom_info_page {
465   - margin-top: 20px;
466   - padding: 20px 100px;
  479 + padding: 20px 40px;
467 480 background-color: #fff;
468 481 min-height: 500px;
469 482  
... ...
admin-web-master/src/views/member/memberList/index.vue
  View file @73551aa
1 1 <template>
2 2 <div style="background-color:#f7f7f7;padding:10px 10px;">
3   - <div class="zhuti">
  3 + <div class="zhuti" v-if="visible==false">
4 4 <div style="height:58px;line-height:58px;">
5 5 <div style="color:#0006"> <span>会员管理</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">会员管理</span></div>
6 6 </div>
... ... @@ -23,7 +23,6 @@
23 23 <el-option
24 24 v-for="(item, index) in tipsList"
25 25 :key="index"
26   -
27 26 :label="item.labelName"
28 27 :value="item.buyerLabelId"
29 28 />
... ... @@ -79,7 +78,7 @@
79 78 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
80 79 >
81 80 <el-table-column prop="name" label="客户昵称" />
82   - <el-table-column prop="phone" label="手机号" />
  81 + <el-table-column prop="phone" label="手机号" show-overflow-tooltip/>
83 82 <el-table-column prop="memberLevelName" label="会员等级" />
84 83 <el-table-column prop="total" label="消费总额" />
85 84 <el-table-column prop="buyers" label="购买次数" />
... ... @@ -135,7 +134,7 @@
135 134 <el-button @click="searchTips">查询</el-button>
136 135 </el-form-item>
137 136 <el-form-item>
138   - <el-button type="text" @click="runTips">管理标签</el-button>
  137 + <el-button style="background-color: #3F9B6A;color: #fff" @click="runTips" >管理标签</el-button>
139 138 </el-form-item>
140 139 </el-form>
141 140 <!-- 多选 -->
... ... @@ -183,7 +182,7 @@
183 182 <el-button style="background-color: #3F9B6A;color: #fff" @click="saveIntegral">确定</el-button>
184 183 </span>
185 184 </el-dialog>
186   - <member-details ref="memberDetails" @reset="reset" />
  185 + <member-details ref="memberDetails" @reset="reset" @childMessage="childMessage" :message="parentMessage" v-if="visible"/>
187 186 </div>
188 187 </template>
189 188  
... ... @@ -233,6 +232,10 @@ export default {
233 232 buyerUserId: '', // 用户id
234 233 credit: '', // 积分值 扣减积分则传负数
235 234 updateWay: true, // 修改积分单选绑定
  235 + visible:false,
  236 + parentMessage:{
  237 +
  238 + }
236 239 }
237 240 },
238 241 created () {
... ... @@ -418,7 +421,12 @@ export default {
418 421 // name: 'customerDetails',
419 422 // params: { buyerUserId: row.buyerUserId, orderFormid: row.orderFormid }
420 423 // })
421   - this.$refs.memberDetails.getUser({ buyerUserId: row.buyerUserId, orderFormid: row.orderFormid })
  424 +
  425 + this.parentMessage ={
  426 + buyerUserId: row.buyerUserId,
  427 + orderFormid: row.orderFormid
  428 + }
  429 + this.visible = true
422 430 },
423 431 // 初始化查询所有数据
424 432 async getAll (formParams) {
... ... @@ -433,6 +441,9 @@ export default {
433 441 },
434 442 reset () {
435 443 this.getAll(this.formParams)
  444 + },
  445 + childMessage(msg){
  446 + this.visible = msg
436 447 }
437 448 }
438 449 }
... ...
admin-web-master/src/views/notice/history.vue
  View file @73551aa
... ... @@ -202,8 +202,14 @@ export default {
202 202 })
203 203 },
204 204 // 重置表单
205   - async clear(formName) {
206   - this.$refs[formName].resetFields()
  205 + clear(formName) {
  206 + this.formParams= {
  207 + noticeTitle: null,
  208 + noticeType: null,
  209 + dates: [],
  210 + page: 1,
  211 + pageSize: 10
  212 + }
207 213 this.getAll()
208 214 },
209 215 // 更改页数
... ...
admin-web-master/src/views/order/after/details/index.vue
  View file @73551aa
... ... @@ -8,14 +8,15 @@
8 8 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">拒绝售后</el-button>
9 9 <el-button style="background-color: #3F9B6A;color: #fff" @click="handle">同意售后</el-button>
10 10 </div>
11   - <div v-else class="btn_list">
  11 + <div class="btn_list" style="margin-right: 10px;">
12 12 <el-button @click="back" class="buttonHover"
13 13 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
14 14 </div>
15 15 </div>
16 16 <div class="detail">
17 17 <div class="order_info">
18   - <p class="detail_title">订单信息</p>
  18 + <!-- <p class="detail_title">订单信息</p> -->
  19 + <TitleWithCircle title="订单信息" style="margin-bottom: 15px;"/>
19 20 <ul class="order_list">
20 21 <li v-for="(item,index) in orderInfo" :key="index">
21 22 <p>{{ item.name }}:</p>
... ... @@ -29,12 +30,13 @@
29 30 </div>
30 31  
31 32 <div class="after_sale_shop">
32   - <p class="detail_title">售后商品</p>
  33 + <!-- <p class="detail_title">售后商品</p> -->
  34 + <TitleWithCircle title="售后商品" style="margin-bottom: 15px;"/>
33 35 <div v-for="(item,index) in shopList" :key="index" class="goods_list">
34 36 <div class="good_details">
35 37 <ul>
36 38 <li>
37   - <img :src="item.image">
  39 + <img :src="$baseURL+item.image">
38 40 </li>
39 41 <li>
40 42 <p>{{ item.productName }}</p>
... ... @@ -61,7 +63,8 @@
61 63 </div>
62 64  
63 65 <div class="after_sales_record">
64   - <p class="detail_title">协商历史</p>
  66 + <!-- <p class="detail_title">协商历史</p> -->
  67 + <TitleWithCircle title="协商历史" style="margin-bottom: 15px;"/>
65 68 <div v-for="(item,index) in recordList" :key="index" class="record_list">
66 69 <div class="record_list_title">
67 70 <p>{{ item.title }}</p>
... ... @@ -115,13 +118,15 @@ import orderInfo from &#39;./component/order-info&#39;
115 118 import storeInfo from './component/store-info'
116 119 import { afterGetById, getDilevery, getBuyer, handles } from '@/api/after'
117 120 import { businessListGetById } from '@/api/business'
  121 +import TitleWithCircle from '@/components/top/index';
118 122 export default {
119 123 components: {
120 124 afterSale,
121 125 buyer,
122 126 logistics,
123 127 orderInfo,
124   - storeInfo
  128 + storeInfo,
  129 + TitleWithCircle
125 130 },
126 131 props: {
127 132 detailRow: {
... ... @@ -350,7 +355,7 @@ export default {
350 355 .after_sales_record {
351 356 min-height: 500px;
352 357 background: rgba(255, 255, 255, 1);
353   - box-shadow: 0px 0px 10px 0px rgba(51, 51, 51, 0.15);
  358 + // box-shadow: 0px 0px 10px 0px rgba(51, 51, 51, 0.15);
354 359 border-radius: 4px;
355 360 padding: 1px 30px;
356 361 margin-top: 15px;
... ...
admin-web-master/src/views/order/after/index.vue
  View file @73551aa
1 1 <!-- -->
2 2 <template>
3   - <div style="background-color:#f7f7f7;padding:10px 10px;">
4   - <div class="refundPage">
  3 + <div style="background-color:#f7f7f7;padding:10px 10px;" >
  4 + <div v-if="detailVisible==false">
  5 + <div class="refundPage">
5 6 <div style="height:58px;line-height:58px;">
6 7 <div style="color:#0006"> <span>订单管理</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">售后处理</span></div>
7 8 </div>
... ... @@ -78,8 +79,8 @@
78 79 />
79 80 </div>
80 81 </div>
81   -
82   - <el-dialog
  82 +
  83 + <!-- <el-dialog
83 84 title="订单详情"
84 85 :visible.sync="detailVisible"
85 86 width="75%"
... ... @@ -88,9 +89,20 @@
88 89 :close-on-click-modal="false"
89 90 :modal-append-to-body="false"
90 91 >
91   - <OrderDetail class="detailDialog" :detail-row="form" @cancel="cancel" />
92   - </el-dialog>
  92 +
  93 + </el-dialog> -->
93 94 </div>
  95 + </div>
  96 +
  97 + <div class="refundPage">
  98 + <div style="height:58px;line-height:58px;" v-if="detailVisible">
  99 + <div style="color:#0006"> <span>订单管理</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">订单详情</span></div>
  100 + <div>
  101 + <OrderDetail class="detailDialog" :detail-row="form" @cancel="cancel" />
  102 + </div>
  103 + </div>
  104 + </div>
  105 +
94 106 </div>
95 107 </template>
96 108  
... ...
admin-web-master/src/views/order/ordersel/pendDetails.vue
  View file @73551aa
... ... @@ -3,7 +3,7 @@
3 3 <div class="cotent">
4 4 <div class="left_part">
5 5 <div class="order_info">
6   - <h2>订单信息</h2>
  6 + <TitleWithCircle title="订单信息" style="margin-bottom: 15px;"/>
7 7 <ul>
8 8 <li>
9 9 <p>
... ... @@ -60,7 +60,7 @@
60 60 </ul>
61 61 </div>
62 62 <div class="goods_info">
63   - <h2>商品信息</h2>
  63 + <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
64 64 <div
65 65 v-for="(item, index) in order.products"
66 66 :key="index"
... ... @@ -80,7 +80,7 @@
80 80 <div class="good_details">
81 81 <ul>
82 82 <li>
83   - <img :src="item.image">
  83 + <img :src="$baseURL+item.image">
84 84 <div class="details">
85 85 <p>{{ item.productName }}</p>
86 86 <p class="skuDetails">
... ... @@ -139,7 +139,7 @@
139 139 </div>
140 140 <div class="right_part">
141 141 <div class="pay_order_info">
142   - <h2>下单人信息</h2>
  142 + <TitleWithCircle title="下单人信息" style="margin-bottom: 15px;"/>
143 143 <p>下单账户: {{ order.customerName }}</p>
144 144 <p>订单总数: {{ order.total }}个</p>
145 145 <p>下单备注: {{ order.remark }}</p>
... ... @@ -197,7 +197,11 @@
197 197  
198 198 <script>
199 199 import { orderGetById, orderGetSelect, orderDilevery } from '@/api/order'
  200 +import TitleWithCircle from '@/components/top/index';
200 201 export default {
  202 + components: {
  203 + TitleWithCircle
  204 + },
201 205 props: {
202 206 detailRow: {
203 207 type: Object,
... ...
admin-web-master/src/views/order/pending/pendDetails.vue
  View file @73551aa
... ... @@ -3,7 +3,8 @@
3 3 <div class="cotent">
4 4 <div class="left_part">
5 5 <div class="order_info">
6   - <h2>订单信息</h2>
  6 + <!-- <h2>订单信息</h2> -->
  7 + <TitleWithCircle title="订单信息" style="margin-bottom: 15px;"/>
7 8 <ul>
8 9 <li>
9 10 <p>
... ... @@ -60,7 +61,7 @@
60 61 </ul>
61 62 </div>
62 63 <div class="goods_info">
63   - <h2>商品信息</h2>
  64 + <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
64 65 <div
65 66 v-for="(item, index) in order.products"
66 67 :key="index"
... ... @@ -80,7 +81,7 @@
80 81 <div class="good_details">
81 82 <ul>
82 83 <li>
83   - <img :src="item.image">
  84 + <img :src="$baseURL+item.image">
84 85 <div class="details">
85 86 <p>{{ item.productName }}</p>
86 87 <p class="skuDetails">
... ... @@ -139,7 +140,7 @@
139 140 </div>
140 141 <div class="right_part">
141 142 <div class="pay_order_info">
142   - <h2>下单人信息</h2>
  143 + <TitleWithCircle title="下单人信息" style="margin-bottom: 15px;"/>
143 144 <p>下单账户: {{ order.customerName }}</p>
144 145 <p>订单总数: {{ order.total }}个</p>
145 146 <p>下单备注: {{ order.remark }}</p>
... ... @@ -198,7 +199,11 @@
198 199  
199 200 <script>
200 201 import { orderGetById, orderGetSelect, orderDilevery } from '@/api/order'
  202 +import TitleWithCircle from '@/components/top/index';
201 203 export default {
  204 + components: {
  205 + TitleWithCircle
  206 + },
202 207 props: {
203 208 detailRow: {
204 209 type: Object,
... ...
admin-web-master/src/views/renovation/commdityClass/Edit.vue
  View file @73551aa
... ... @@ -142,7 +142,7 @@
142 142 </el-dialog>
143 143 </template>
144 144 <script>
145   -import { uploadUrl } from '@/utils/request'
  145 +import { upUrl } from '@/utils/request'
146 146 import {
147 147 getSelect,
148 148 commdityClassAdd,
... ... @@ -205,9 +205,10 @@ export default {
205 205 headers: {
206 206 Authorization: ''
207 207 },
208   - action: uploadUrl,
  208 + action: upUrl,
209 209 dataObj: {
210   - folderId: 1
  210 + folderId: 1,
  211 +
211 212 },
212 213 deleteArr: []
213 214 }
... ...
admin-web-master/src/views/renovation/commoditySystem/index.vue
  View file @73551aa
... ... @@ -109,14 +109,14 @@
109 109 label="上架状态"
110 110 show-overflow-tooltip
111 111 >
112   - <template slot-scope="scope">
  112 + <template slot-scope="scope" >
113 113 <span v-if="scope.row.shelveState == 0">已下架</span>
114 114 <span v-if="scope.row.shelveState == 1">已上架</span>
115 115 <span v-if="scope.row.shelveState == 2">待审核</span>
116 116 <span v-if="scope.row.shelveState == 3">审核失败</span>
117 117 </template>
118 118 </el-table-column>
119   - <el-table-column label="操作" width="200">
  119 + <el-table-column label="操作" width="220" fixed="right">
120 120 <template slot-scope="scope">
121 121 <div class="btnList">
122 122 <div
... ...
admin-web-master/src/views/stockControl/inventory/index.vue
  View file @73551aa
... ... @@ -74,7 +74,7 @@
74 74 />
75 75 <el-table-column label="商品主图" width="150" align="center">
76 76 <template slot-scope="scope">
77   - <img height="80" width="80" :src="scope.row.image" alt srcset>
  77 + <img height="80" width="80" :src="$baseURL+scope.row.image" alt srcset>
78 78 </template>
79 79 </el-table-column>
80 80 <el-table-column prop="productName" label="商品名称" width="180" />
... ... @@ -117,7 +117,7 @@
117 117 <span v-if="scope.row.shelveState == 3">审核失败</span>
118 118 </template>
119 119 </el-table-column>
120   - <el-table-column label="操作" width="200">
  120 + <el-table-column label="操作" width="220" fixed="right">
121 121 <template slot-scope="scope">
122 122 <div v-if="scope.row.shelveState == 1" @click="OutForced(scope.row)" class="tableBtn greens">强制下架</div>
123 123 <div v-if="scope.row.shelveState == 1" @click="setFictitious(scope.row)" class="tableBtn greens">虚拟销量</div>
... ...
admin-web-master/src/views/stockControl/stocksForewarn/index.vue
  View file @73551aa
... ... @@ -5,31 +5,31 @@
5 5 <div style="height:58px;line-height:58px;">
6 6 <div style="color:#0006"> <span>库存管理</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">库存预警</span></div>
7 7 </div>
8   - <div style="margin-bottom:20px;"><el-button plain @click="setthreshold" size="mini" style="background-color: #3F9B6A;color: #fff;">库存阈值设置</el-button></div>
  8 + <div style="margin-bottom:20px;"><el-button plain @click="setthreshold" style="background-color: #3F9B6A;color: #fff;">库存阈值设置</el-button></div>
9 9 <!-- 搜索 -->
10 10 <div class="filter-container">
11 11 <div style="display:flex;justify-content: space-between;background-color: #f5f5f5;padding:10px">
12 12 <div style="line-height:200%">筛选查询</div>
13 13 <div>
14 14 <button @click="toggleFilter">收起筛选</button>
15   - <el-button plain @click="search" size="mini" style="background-color: #3F9B6A;color: #fff;">查询</el-button>
16   - <el-button plain @click="resetting" size="mini" style="color: #000;border-color:#d5d5d5;">重置</el-button>
  15 + <el-button plain @click="search" style="background-color: #3F9B6A;color: #fff;">查询</el-button>
  16 + <el-button plain @click="clear" style="color: #000;border-color:#d5d5d5;">重置</el-button>
17 17 </div>
18 18 </div>
19 19 <div :class="fut?'formSearch':'collapsed'" ref="formSearch">
20   - <el-form :inline="true" :model="formSel" label-width="auto">
  20 + <el-form :inline="true" :model="formInline" label-width="auto">
21 21 <el-form-item label="商品名称">
22   - <el-input v-model="formSel.shopname" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
23   - </el-form-item>
24   - <el-form-item label="入库人">
25   - <el-input v-model="formSel.rkr" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
26   - </el-form-item>
27   - <el-form-item label="上架时间">
28   - <el-input v-model="formSel.stime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
29   - </el-form-item>
30   - <el-form-item label="入库时间">
31   - <el-input v-model="formSel.rtime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
  22 + <el-input v-model="formInline.productName" placeholder="请输入商品名称" style="width: 178px;margin-right: 5px;"/>
32 23 </el-form-item>
  24 + <!-- <el-form-item label="入库人">
  25 + <el-input v-model="formSel.rkr" placeholder="请输入方案编号" style="width: 178px;margin-right: 5px;"/>
  26 + </el-form-item> -->
  27 + <!-- <el-form-item label="上架时间">
  28 + <el-input v-model="formInline.stime" placeholder="请输入方案编号" style="width: 178px;margin-right: 5px;"/>
  29 + </el-form-item> -->
  30 + <!-- <el-form-item label="入库时间">
  31 + <el-input v-model="formSel.rtime" placeholder="请输入方案编号" style="width: 178px;margin-right: 5px;"/>
  32 + </el-form-item> -->
33 33 </el-form>
34 34 </div>
35 35 </div>
... ... @@ -42,7 +42,6 @@
42 42 ref="multipleTable"
43 43 v-loading="loading"
44 44 :data="tableData"
45   - border
46 45 tooltip-effect="dark"
47 46 @selection-change="handleSelectionChange"
48 47 :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
... ... @@ -57,7 +56,7 @@
57 56 />
58 57 <el-table-column label="商品主图" width="150" align="center">
59 58 <template slot-scope="scope">
60   - <img height="80" width="80" :src="scope.row.image" alt srcset>
  59 + <img height="80" width="80" :src="$baseURL+scope.row.image" alt srcset>
61 60 </template>
62 61 </el-table-column>
63 62 <el-table-column prop="productName" label="商品名称" min-width="10%" />
... ... @@ -117,19 +116,19 @@
117 116 <div class="formyuzhi">
118 117 <el-form :inline="true" :model="kucunNum" label-width="auto" label-position="left">
119 118 <el-form-item label="最小库存阈值">
120   - <el-input v-model="kucunNum.minNum" placeholder="请输入" size="mini" style="width: 100%;"/>
  119 + <el-input v-model="kucunNum.minNum" placeholder="请输入" style="width: 100%;"/>
121 120 </el-form-item>
122 121 <el-form-item label="最大库存阈值">
123   - <el-input v-model="kucunNum.maxNum" placeholder="请输入" size="mini" style="width: 100%;"/>
  122 + <el-input v-model="kucunNum.maxNum" placeholder="请输入" style="width: 100%;"/>
124 123 </el-form-item>
125 124 <el-form-item label="安全库存量">
126   - <el-input v-model="kucunNum.anNum" placeholder="请输入" size="mini" style="width: 100%;"/>
  125 + <el-input v-model="kucunNum.anNum" placeholder="请输入" style="width: 100%;"/>
127 126 </el-form-item>
128 127 </el-form>
129 128 </div>
130 129 <span slot="footer" class="dialog-footer">
131   - <el-button plain @click="handleClose" size="mini" style="color: #000;border-color:#d5d5d5;">取消</el-button>
132   - <el-button plain @click="kucunSet" size="mini" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  130 + <el-button plain @click="handleClose" style="color: #000;border-color:#d5d5d5;">取消</el-button>
  131 + <el-button plain @click="kucunSet" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
133 132  
134 133 </span>
135 134 </el-dialog>
... ... @@ -202,7 +201,9 @@ export default {
202 201 },
203 202 // 查询
204 203 search () {
205   -
  204 + this.total = 1;
  205 + this.formInline.page = 1;
  206 + this.getAll(this.formInline);
206 207 },
207 208 async kucunSet(){
208 209 const yuzhi={
... ... @@ -227,8 +228,21 @@ export default {
227 228 },
228 229 handleClose() {
229 230 this.dialogVisible = false
230   - }
231   -
  231 + },
  232 + // 重置
  233 + clear () {
  234 + this.formInline = {
  235 + searchType: '1',
  236 + search: '', // 搜索字段
  237 + state: '',
  238 + // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
  239 + dates: [], // 下单时间数组
  240 + page: 1,
  241 + shopName: '',
  242 + pageSize: 10
  243 + };
  244 + this.getAll(this.formInline);
  245 + },
232 246 }
233 247 }
234 248 </script>
... ...
ceres-uniapp-master - 副本/components/canvasShow/basics/product/app/index.vue
  View file @73551aa
... ... @@ -39,7 +39,8 @@
39 39 <view class="scroll-list" style="flex-direction: row;">
40 40 <view class="scroll-list__goods-item" v-for="(item, index) in list" :key="index"
41 41 :class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']" @click="goodsDateils(item.shopId,item.productId,item.skuId)">
42   - <image class="scroll-list__goods-item__image" :src="item.image"></image>
  42 +
  43 + <image class="scroll-list__goods-item__image" :src="$baseURL+item.image"></image>
43 44 <view class="scroll-list__goods-item__title">{{item.productName}}</view>
44 45 <view class="" style="display: flex;justify-content: space-between;">
45 46 <text class="scroll-list__goods-item__text" style="color: #C44A51;">￥{{ item.price }}</text>
... ... @@ -78,15 +79,15 @@
78 79 <swiper-item class="product-list-item-warp" v-for="(item,index) in productData" :key="index">
79 80 <div class="product-list-item" v-if="JSON.stringify(item)!=='{}'" @click="jumpProductDetail(item)">
80 81 <div class="product-list-img">
81   - <img class="img pic-img default-img" :src="item.image">
  82 + <img class="img pic-img default-img" :src="$baseURL+item.image">
82 83 </div>
83 84 <div class="product-list-info">
84   - <label class="product-name">{{ item.productName }}</label>
  85 + <label class="product-name">{{ item.productName}}</label>
85 86 <div class="flex">
86 87 <div class="shop-box" v-if="typeId == 1" @click.stop="jumpStore(item)">
87 88 <label class="shop-name">{{ item.shopName }}</label>
88 89 <div class="shop-logo">
89   - <img :src="item.shopLogo">
  90 + <img :src="$baseURL+item.shopLogo">
90 91 </div>
91 92 </div>
92 93 <label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
... ... @@ -158,7 +159,7 @@
158 159 <div class="product-list-item-warp" v-for="(item,index) in productData" :key="index">
159 160 <div @click="jumpProductDetail(item)" class="product-list-item" v-if="JSON.stringify(item)!=='{}'">
160 161 <div class="product-list-img">
161   - <img class="img pic-img default-img" :src="item.image">
  162 + <img class="img pic-img default-img" :src="$baseURL+item.image">
162 163 </div>
163 164 <div class="product-list-info">
164 165 <label class="product-name">{{ item.productName }}</label>
... ... @@ -166,7 +167,7 @@
166 167 <div class="shop-box" v-if="typeId == 1" @click.stop="jumpStore(item)">
167 168 <label class="shop-name">{{ item.shopName }}</label>
168 169 <div class="shop-logo">
169   - <img :src="item.shopLogo">
  170 + <img :src="$baseURL+item.shopLogo">
170 171 </div>
171 172 </div>
172 173 <label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
... ...
ceres-uniapp-master/components/basics/categoryShow.vue
  View file @73551aa
... ... @@ -14,7 +14,7 @@
14 14 <view class="shop-box" @click.stop="jumpStore(item)">
15 15 <view class="shop-name" @click="jumpProductDetail(item)">{{item.shopName}}</view>
16 16 <view class="shop-logo">
17   - <img :src="item.shopLogo">
  17 + <img :src="$baseURL+item.shopLogo">
18 18 </view>
19 19 </view>
20 20 <view class="buy-count">{{item.users?item.users: 0}}人付款</view>
... ...
ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue
  View file @73551aa
... ... @@ -39,7 +39,7 @@
39 39 <view class="scroll-list" style="flex-direction: row;">
40 40 <view class="scroll-list__goods-item" v-for="(item, index) in list" :key="index"
41 41 :class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']" @click="goodsDateils(item.shopId,item.productId,item.skuId)">
42   - <image class="scroll-list__goods-item__image" :src="item.image"></image>
  42 + <image class="scroll-list__goods-item__image" :src="$baseURL+item.image"></image>
43 43 <view class="scroll-list__goods-item__title">{{item.productName}}</view>
44 44 <view class="" style="display: flex;justify-content: space-between;">
45 45 <text class="scroll-list__goods-item__text" style="color: #C44A51;">￥{{ item.price }}</text>
... ... @@ -78,7 +78,7 @@
78 78 <swiper-item class="product-list-item-warp" v-for="(item,index) in productData" :key="index">
79 79 <div class="product-list-item" v-if="JSON.stringify(item)!=='{}'" @click="jumpProductDetail(item)">
80 80 <div class="product-list-img">
81   - <img class="img pic-img default-img" :src="item.image">
  81 + <img class="img pic-img default-img" :src="$baseURL+item.image">
82 82 </div>
83 83 <div class="product-list-info">
84 84 <label class="product-name">{{ item.productName }}</label>
... ... @@ -86,7 +86,7 @@
86 86 <div class="shop-box" v-if="typeId == 1" @click.stop="jumpStore(item)">
87 87 <label class="shop-name">{{ item.shopName }}</label>
88 88 <div class="shop-logo">
89   - <img :src="item.shopLogo">
  89 + <img :src="$baseURL+item.shopLogo">
90 90 </div>
91 91 </div>
92 92 <label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
... ... @@ -158,7 +158,7 @@
158 158 <div class="product-list-item-warp" v-for="(item,index) in productData" :key="index">
159 159 <div @click="jumpProductDetail(item)" class="product-list-item" v-if="JSON.stringify(item)!=='{}'">
160 160 <div class="product-list-img">
161   - <img class="img pic-img default-img" :src="item.image">
  161 + <img class="img pic-img default-img" :src="$baseURL+item.image">
162 162 </div>
163 163 <div class="product-list-info">
164 164 <label class="product-name">{{ item.productName }}</label>
... ... @@ -166,7 +166,7 @@
166 166 <div class="shop-box" v-if="typeId == 1" @click.stop="jumpStore(item)">
167 167 <label class="shop-name">{{ item.shopName }}</label>
168 168 <div class="shop-logo">
169   - <img :src="item.shopLogo">
  169 + <img :src="$baseURL+item.shopLogo">
170 170 </div>
171 171 </div>
172 172 <label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
... ... @@ -315,7 +315,8 @@
315 315 margin-right: 20rpx;
316 316  
317 317 &__image {
318   - width: 220rpx;
  318 + margin-left: 10%;
  319 + width: 80%;
319 320 height: 220rpx;
320 321 border-radius: 10rpx;
321 322 }
... ...
ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
  View file @73551aa
... ... @@ -122,10 +122,10 @@
122 122  
123 123 import comBanner from '@/components/canvasShow/basics/banner.vue'
124 124 import comText from '@/components/canvasShow/basics/text.vue'
125   -import comImageText from '@/components/canvasShow/basics/imageText'
126   -import comBrandList from '@/components/canvasShow/basics/brandList'
127   -import comCategoryList from '@/components/canvasShow/basics/categoryList'
128   -import comImageTextList from '@/components/canvasShow/basics/imageTextList'
  125 +import comImageText from '@/components/canvasShow/basics/imageText.vue'
  126 +import comBrandList from '@/components/canvasShow/basics/brandList.vue'
  127 +import comCategoryList from '@/components/canvasShow/basics/categoryList.vue'
  128 +import comImageTextList from '@/components/canvasShow/basics/imageTextList.vue'
129 129 import comAssistDiv from '@/components/canvasShow/basics/assistDiv'
130 130 import comImageTextNav from '@/components/canvasShow/basics/imageTextNav'
131 131 import comProduct from '@/components/canvasShow/basics/product/app/index'
... ...
ceres-uniapp-master/components/hoteRecommed/index.vue
  View file @73551aa
... ... @@ -11,7 +11,7 @@
11 11 @click="goodsDateils(item.shopId,item.productId,item.skuId)"
12 12 >
13 13 <view class="itemImg">
14   - <image :src="item.image" class="pic-img default-img"></image>
  14 + <image :src="$baseURL+item.image" class="pic-img default-img"></image>
15 15 </view>
16 16 <view class="itemTit">{{item.productName}}</view>
17 17 <view class="flex-items shopNameBox">
... ...
ceres-uniapp-master/config/api.js
  View file @73551aa
1 1  
2   -const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
3   -const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
4   -// const DOMAIN_PREFIXPING = 'http://10.0.0.51:9003'
5   -// const DOMAIN_PREFIX = 'http://10.0.0.51:9007'
  2 +// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
  3 +// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
  4 +const DOMAIN_PREFIXPING = 'http://192.168.2.138:9003'
  5 +const DOMAIN_PREFIX = 'http://192.168.2.138:9007'
6 6 // const host = `${window.location.protocol}//${window.location.host}`
7 7 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
8 8 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
9 9 // const DOMAIN_PREFIXPING = `http://8.130.38.56:9003`
10 10 // const DOMAIN_PREFIX = 'http://8.130.38.56:9007'
11   -
  11 +
12 12  
13 13  
14 14 // const DOMAIN_PREFIXPING = 'http://8.130.38.56:9007'
... ... @@ -39,13 +39,14 @@ const TERMINAL = 1
39 39  
40 40 module.exports = {
41 41 terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
42   - SettledMerchantPrefix: 'https://jy.scjysm.asia:18086/settled-merchant', //商家入驻链接
  42 + SettledMerchantPrefix: 'https://jy.scjysm.asia:18086/cdwlMall/meserver/settled-merchant', //商家入驻链接
43 43 shareLink: DOMAIN_PREFIX + '/h5', // 分享地址
44 44 // shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
45 45  
46 46  
47 47 //登录注册
48   - Verify: WX_API_BASE + '/app/getCode', // 获取短信验证码
  48 + // Verify: WX_API_BASE + '/app/getCode', // 获取短信验证码
  49 + verification:WX_API_BASE + '/app/verification', // 获取短信验证码
49 50 Login: WX_API_BASE + '/app/login', // 手机号验证码登录、注册
50 51 WxLogin: WX_API_BASE + '/app/wxLogin', // 微信登录
51 52 AlipayLogin: WX_API_BASE + '/app/alipayLogin', // 支付宝登录
... ... @@ -318,4 +319,7 @@ module.exports = {
318 319 cereCouponKeyUse: WX_API_BASE + '/order/cereCouponKeyUse',
319 320 //问卷解析token
320 321 jietoken: WX_API_BASE + '/cereQuestionnaireAnswering/get/token',
  322 + // 上传图片
  323 + UpUrl: WX_API_BASEPING + '/miniio/uploadQuestion',
  324 +
321 325 }
... ...
ceres-uniapp-master/pages/tabbar/cart/index.vue
  View file @73551aa
... ... @@ -116,7 +116,7 @@
116 116 ></image>
117 117 <view class="pro-r">
118 118 <image
119   - :src="skuItem.image"
  119 + :src="$baseURL+skuItem.image"
120 120 class="pro-img default-img u-skeleton-fillet"
121 121 ></image>
122 122 <view class="pro-r-r u-skeleton-fillet">
... ...
ceres-uniapp-master/pages/tabbar/index/index.vue
  View file @73551aa
... ... @@ -176,7 +176,6 @@ export default {
176 176 // })
177 177 NET.request(apiUrl, {}, 'GET').then(res => {
178 178 if (JSON.stringify(res.data) !== '{}') {
179   - console.log(res.data.json)
180 179 var componentsData = JSON.parse(res.data.json)
181 180 this.componentsData = componentsData
182 181 }
... ...
ceres-uniapp-master/pages_category_page1/coupon/product.vue
  View file @73551aa
... ... @@ -16,7 +16,7 @@
16 16 @click="goodsDateils(item.shopId,item.productId,item.skuId)"
17 17 >
18 18 <view class="productImg">
19   - <image :src="item.image"></image>
  19 + <image :src="$baseURL+item.image"></image>
20 20 </view>
21 21 <view class="productTit fs28 font-color-333">{{item.productName}}</view>
22 22 <view class="productPrice font-color-C83732 fs40">￥{{item.price}}</view>
... ...
ceres-uniapp-master/pages_category_page1/distributionModule/index.vue
  View file @73551aa
... ... @@ -19,7 +19,7 @@
19 19 <view class="flex-items-plus">
20 20 <image
21 21 class="storeLogoImg"
22   - :src="item.shopLogo"
  22 + :src="$baseURL+item.shopLogo"
23 23 ></image>
24 24 <view class="font-color-656 fs24 mar-left-20">
25 25 <label class="fs30 font-color-333">{{ item.shopName }}</label>
... ...
ceres-uniapp-master/pages_category_page1/distributionModule/salesIndex.vue
  View file @73551aa
... ... @@ -5,7 +5,7 @@
5 5 <view class="salesIndex-topBackImg">
6 6 <view class="topStoreTag flex-row-plus">
7 7 <view class="storeName overflow font-color-FFF">
8   - <image class="storeLogoImg" :src="item.shopLogo"></image>
  8 + <image class="storeLogoImg" :src="$baseURL+item.shopLogo"></image>
9 9 <label class=" fs24">{{item.shopName}}</label>
10 10 </view>
11 11 </view>
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
  View file @73551aa
... ... @@ -6,7 +6,7 @@
6 6 <view class="addEvaluate-box flex-items-plus flex-column-plus">
7 7 <view class="addEvaluate flex-column-plus">
8 8 <view class="addEvaluateTitle-box flex-row-plus mar-top-20 mar-left-20">
9   - <image class="title-img" :src="productImage"></image>
  9 + <image class="title-img" :src="$baseURL+productImage"></image>
10 10 <view class="title-textbox overflow">
11 11 <label class="fs28 title-text">{{orderProductVO.productName}}</label>
12 12 <view v-if="orderProductVO.value" class="fs24 mar-top-10 sukValue">
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodActivityDetail.vue
  View file @73551aa
... ... @@ -19,7 +19,7 @@
19 19 >
20 20 <image
21 21 class="goodsImg default-img u-skeleton-fillet"
22   - :src="imgItem"
  22 + :src="$baseURL+imgItem"
23 23 ></image>
24 24 </swiper-item>
25 25 </swiper>
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodSkuSelect.vue
  View file @73551aa
... ... @@ -16,7 +16,7 @@
16 16 <view class="detailImg-box flex-row-plus">
17 17 <image
18 18 class="detailImg"
19   - :src="selectedSku.image"
  19 + :src="$baseURL+selectedSku.image"
20 20 ></image>
21 21 <view class="flex-column-plus mar-left-40">
22 22 <view class="" style="color: #f4281e;">
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
  View file @73551aa
... ... @@ -6,11 +6,11 @@
6 6 <view class="addEvaluate-box flex-items-plus flex-column-plus">
7 7 <view class="addEvaluate flex-column-plus">
8 8 <view class="addEvaluateTitle-box flex-row-plus mar-top-20 mar-left-20">
9   - <image class="title-img" :src="commentData.image"></image>
  9 + <image class="title-img" :src="$baseURL+commentData.image"></image>
10 10 <view class="title-textbox overflow">
11 11 <label class="fs24 title-text">{{commentData.productName}}</label>
12 12 <view class="font-color-999 fs22 mar-top-10">
13   - {{commentData.value}}
  13 + 规格：{{commentData.value}}
14 14 </view>
15 15 </view>
16 16 </view>
... ... @@ -77,7 +77,7 @@
77 77 logisticsStar:5,
78 78 serviceStar:5,
79 79 fileList:[],
80   - action:API.UploadUrl,
  80 + action:API.UpUrl,
81 81 formData:{'folderId': -1},
82 82 commentText:'',
83 83 commentImgsFlag:false,
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue
  View file @73551aa
... ... @@ -183,7 +183,7 @@
183 183 <image
184 184 @click="handleJumpToStore"
185 185 class="inStore-logo default-img"
186   - :src="productData.shopLogo"
  186 + :src="$baseURL+productData.shopLogo"
187 187 ></image>
188 188 </view>
189 189 <view class="flex-display flex-column mar-left-20">
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/goodsList.vue
  View file @73551aa
... ... @@ -95,7 +95,7 @@
95 95 <view class="listItem">
96 96 <view class="itemBox">
97 97 <img
98   - :src="item.image"
  98 + :src="$baseURL+item.image"
99 99 class="pic-img u-skeleton-fillet default-img"
100 100 >
101 101 </view>
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
  View file @73551aa
... ... @@ -60,7 +60,7 @@
60 60 </view>
61 61 <view class="goodsDes-box u-skeleton-fillet flex-column-plus mar-top-30">
62 62 <view class="flex-row-plus" @click.stop="goGoodsDetails(item.shopId,item.productId,item.skuId)">
63   - <image class="goodsDes-img default-img" :src="item.productImage"></image>
  63 + <image class="goodsDes-img default-img" :src="$baseURL+item.productImage"></image>
64 64 <view class="goodsDesText-box">
65 65 <label class="fs26 goodsDes-text">{{item.productName}}</label>
66 66 <view class="mar-top-70">
... ...
ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApply.vue
  View file @73551aa
... ... @@ -19,7 +19,7 @@
19 19 :name='item.skuId'
20 20 @change="checkboxChange(item)">
21 21 <view class="order-info-item">
22   - <image :src="item.image"
  22 + <image :src="$baseURL+item.image"
23 23 class="product-img"></image>
24 24 <view class="info-box">
25 25 <text class="product-name">{{ item.productName }}</text>
... ...
ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue
  View file @73551aa
... ... @@ -338,7 +338,7 @@ export default {
338 338 returnImgs: "",
339 339 returnReason: 0
340 340 },
341   - action: API.UploadUrl,
  341 + action: API.UpUrl,
342 342 formData: {'folderId': -1},
343 343 headerToken: {Authorization: ''},
344 344 fileList: [],
... ...
ceres-uniapp-master/pages_category_page1/orderModule/index.vue
  View file @73551aa
... ... @@ -36,7 +36,7 @@
36 36 @click.stop="goShop(orderItem.shopId)"
37 37 >
38 38 <image
39   - :src="orderItem.shopLogo"
  39 + :src="$baseURL+orderItem.shopLogo"
40 40 class="shop-img"
41 41 />
42 42 <text class="shop-name">{{ orderItem.shopName }}</text>
... ... @@ -60,12 +60,12 @@
60 60 :key="skuIndex"
61 61 >
62 62 <image
63   - :src="skuItem.image"
  63 + :src="$baseURL+skuItem.image"
64 64 class="product-img default-img"
65 65 />
66 66 <view class="info-box">
67 67 <text class="product-name">{{ skuItem.productName }}</text>
68   - <view class="product-sku">{{ skuItem.value }}</view>
  68 + <view class="product-sku">规格：{{ skuItem.value }}</view>
69 69 <view class="price-sku-box">
70 70 <view class="box-h flex-items-plus">
71 71 <text class="product-price">
... ... @@ -95,7 +95,7 @@
95 95 <view class="total-price-box">
96 96 总价¥{{
97 97 (orderItem.orderPrice + orderItem.logisticsPrice).toFixed(2)
98   - }},优惠¥{{ Number(orderItem.discountPrice)/100 }}
  98 + }},优惠¥{{orderItem.discountPrice}}
99 99 <span v-if="orderItem.price > 0">
100 100 ，{{ orderItem.state === 1 ? '应付¥' : '实付¥' }}{{ orderItem.price }}
101 101 </span>
... ...
ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue
  View file @73551aa
... ... @@ -39,7 +39,7 @@
39 39 <view class="order-info">
40 40 <view class="order-info-item" v-for="(cItem, index) in item.skus"
41 41 :key="cItem.productId">
42   - <image :src="cItem.image" class="product-img"></image>
  42 + <image :src="$baseURL+cItem.image" class="product-img"></image>
43 43 <view class="info-box">
44 44 <text class="product-name">{{ cItem.productName }}</text>
45 45 <view class="product-sku">
... ... @@ -1435,7 +1435,8 @@
1435 1435 title: '结算中...',
1436 1436 })
1437 1437 try {
1438   - console.log('结算中结算中结算中结算中结算中结算中', data)
  1438 + console.log('结算中结算中结算中结算中结算中结算中', data)
  1439 + // return
1439 1440 const res = await NET.request(API.PlaceOrder, data, 'POST')
1440 1441 // 下单成功处理埋点
1441 1442 this.$store.dispatch('doPointer', {
... ... @@ -1468,6 +1469,7 @@
1468 1469 if (this.payObj.paymentMode && this.payObj.huabeiPeriod) {
1469 1470 submitResult.huabeiPeriod = this.payObj.huabeiPeriod
1470 1471 }
  1472 + // return
1471 1473 await handleDoPay.call(this, submitResult)
1472 1474  
1473 1475 } catch (e) {
... ...
ceres-uniapp-master/pages_category_page1/orderModule/orderDetails.vue
  View file @73551aa
... ... @@ -113,13 +113,13 @@
113 113 <view class="order-info">
114 114 <view class="order-info-item" v-for="proItem in dataList.skus"
115 115 :key="proItem.productId" @click="goodsItemTap(proItem.productId,proItem.skuId)">
116   - <image :src="proItem.image" class="product-img default-img"></image>
  116 + <image :src="$baseURL+proItem.image" class="product-img default-img"></image>
117 117 <view class="info-box">
118 118 <text class="product-name">{{ proItem.productName }}</text>
119 119 <view class="price-sku-box">
120 120 <view class="product-sku">
121 121 <view class="mar-left-20" v-for="vItem in proItem.values">
122   - <text>{{ vItem }}</text>
  122 + <text>规格：{{ vItem }}</text>
123 123 </view>
124 124 </view>
125 125 <view class="product-num">x {{ proItem.number }}</view>
... ...
ceres-uniapp-master/pages_category_page1/store/index.vue
  View file @73551aa
... ... @@ -15,7 +15,7 @@
15 15 <view class="stopInfo">
16 16 <view class="shop-top-content">
17 17 <view class="contentLeft">
18   - <image :src="storeInfo.shopLogo" class="photo-img"></image>
  18 + <image :src="$baseURL+storeInfo.shopLogo" class="photo-img"></image>
19 19 <view class="shop-info-top">
20 20 <view class="shop-name">
21 21 <text class="shop-name">{{storeInfo.shopName}}</text>
... ... @@ -87,6 +87,7 @@
87 87 </view>
88 88 <view v-else>
89 89 <view class="shop-banner-box" v-if="bannerInfo && bannerInfo.length > 0">
  90 +
90 91 <swiper indicator-dots="true">
91 92 <swiper-item v-for="(item, index) in bannerInfo" :key="index" @click="applyForRecruit()">
92 93 <image :src="item.bannerImage" class="shop-banner-img"></image>
... ... @@ -133,7 +134,7 @@
133 134 <view class="shop-list-box" v-if="total > 0">
134 135 <view class="item" v-for="(cItem, index) in storeInfolist" :key="index"
135 136 @click="goodsItemTap(cItem.productId,cItem.skuId)">
136   - <image :src="cItem.image" class="product-img default-img"></image>
  137 + <image :src="$baseURL+cItem.image" class="product-img default-img"></image>
137 138 <view class="product-bottom-box">
138 139 <view class="product-name">{{cItem.productName}}</view>
139 140 <view class="product-num font-color-C5AA7B mar-top-10">已售{{cItem.number}}件
... ...
ceres-uniapp-master/pages_category_page2/channelCoupon/index.vue
  View file @73551aa
... ... @@ -53,7 +53,7 @@
53 53 <div class="shop-box" @click.stop="jumpStore(item)">
54 54 <label class="shop-name">{{item.shopName}}</label>
55 55 <div class="shop-logo">
56   - <img :src="item.shopLogo">
  56 + <img :src="$baseURL+item.shopLogo">
57 57 </div>
58 58 </div>
59 59 <label class="buy-count">{{item.users?item.users: 0}}人付款</label>
... ...
ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue
  View file @73551aa
... ... @@ -8,7 +8,7 @@
8 8 <view class="item" v-for="item in FindReturnDatalist">
9 9 <view class="order-list-top">
10 10 <view class="top-l" @click="goShop(item.shopId)">
11   - <image :src="item.shopLogo" class="shop-img"></image>
  11 + <image :src="$baseURL+item.shopLogo" class="shop-img"></image>
12 12 <text class="shop-name">{{item.shopName}}</text>
13 13 <image src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/arrowRight.png" class="arrow-img"></image>
14 14 </view>
... ...
ceres-uniapp-master/pages_category_page2/userModule/accountLogin.vue
  View file @73551aa
1 1 <template>
2   - <!-- 登录 -->
3   - <view class="container flex-items-plus flex-column">
4   - <global-loading />
5   - <view class="login-logoBox">
6   - <!-- <image
  2 + <!-- 登录 -->
  3 + <view class="container flex-items-plus flex-column">
  4 + <global-loading />
  5 + <view class="login-logoBox">
  6 + <!-- <image
7 7 class="login-logo"
8 8 src="@/static/logo.png"
9 9 ></image> -->
10   - <text style="color:#3f9b6a;font-weight:bold;font-size:30px;">锦江公园</text>
11   - </view>
12   - <view class="iphoneNum-box flex-row-plus flex-items">
13   - <view style="margin-right: 30rpx">
14   - <image
15   - class="loginIcon"
16   - src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/phone.png"
17   - ></image>
18   - </view>
19   - <view>
20   - <input
21   - v-model="loginQuery.account"
22   - placeholder-class="iphoneNum-input"
23   - type="number"
24   - maxlength='11'
25   - placeholder="请输入您的手机号"
26   - />
27   - </view>
28   - </view>
29   - <view class="flex-row-plus mar-top-20">
30   - <view class="code-box">
31   - <view style="margin-right: 30rpx">
32   - <image
33   - class="loginIcon"
34   - src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/code.png"
35   - ></image>
36   - </view>
37   - <view>
38   - <input
39   - v-model="loginQuery.code"
40   - :maxlength="4"
41   - placeholder-class="codeNum-input"
42   - placeholder="请输入验证码"
43   - />
44   - </view>
45   - </view>
46   - <view
47   - :class="disabled === true ? 'on' : ''"
48   - :disabled="disabled"
49   - class="getcode"
50   - @click="codede"
51   - >{{ text }}
52   - </view>
53   - </view>
54   - <view class="mar-top-60">
55   - <view
56   - class="registerBut mar-top-100"
57   - @click="login"
58   - >登录
59   - </view>
60   - </view>
61   - </view>
  10 + <text style="color:#3f9b6a;font-weight:bold;font-size:30px;">锦江公园</text>
  11 + </view>
  12 + <view class="iphoneNum-box flex-row-plus flex-items">
  13 + <view style="margin-right: 30rpx">
  14 + <image class="loginIcon"
  15 + src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/phone.png"></image>
  16 + </view>
  17 + <view>
  18 + <input v-model="loginQuery.account" placeholder-class="iphoneNum-input" type="number" maxlength='11'
  19 + placeholder="请输入您的手机号" />
  20 + </view>
  21 + </view>
  22 + <view class="flex-row-plus">
  23 + <view class="code-box">
  24 + <view style="margin-right: 30rpx">
  25 + <image class="loginIcon"
  26 + src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/code.png"></image>
  27 + </view>
  28 + <view>
  29 + <input v-model="loginQuery.code" :maxlength="6" placeholder-class="codeNum-input"
  30 + placeholder="请输入验证码" />
  31 + </view>
  32 + </view>
  33 + <view :class="disabled === true ? 'on' : ''" :disabled="disabled" class="getcode" @click="codede">{{ text }}
  34 + </view>
  35 + </view>
  36 + <view class="mar-top-60">
  37 + <view class="registerBut mar-top-100" @click="login">登录
  38 + </view>
  39 + </view>
  40 + <view class="agreement">
  41 + <image v-if="!agreement" src="../../static/images/none.png" mode="" @click="agreement=true"></image>
  42 + <image v-else src="../../static/images/solid.png" mode="" @click="agreement=false"></image>
  43 + <text class="font-color-999">登录即代表同意</text>
  44 + <text class="font-color-C5AA7B" @click="protocol('app_user_agreement')">《APP用户服务协议》</text>和
  45 + <text class="font-color-C5AA7B" @click="protocol('app_privacy_agreement')">《APP个人隐私协议》</text>
  46 + </view>
  47 + </view>
62 48 </template>
63 49  
64 50 <script>
65   -import sendVerifyCode from "@/mixins/SendVerifyCode";
  51 + import sendVerifyCode from "@/mixins/SendVerifyCode";
66 52  
67   -const NET = require('../../utils/request')
68   -const API = require('../../config/api')
69   -export default {
70   - data() {
71   - return {
72   - loginQuery: {
73   - account: '',
74   - code: '',
75   - salesId: '',
76   - },
77   - // 获取验证码
78   - VerifyQuery: {
79   - phone: ""
80   - },
81   - inviteSpell: {},
82   - inviteSpelltype: false,
83   - beforePage: undefined,
84   - doubleBeforePage: undefined
85   - }
86   - },
87   - mixins: [sendVerifyCode],
88   - onLoad(options) {
89   - if (options.inviteSpell == 1) {
90   - this.inviteSpelltype = true
91   - this.inviteSpell = uni.getStorageSync('inviteSpell');
92   - }
93   - this.loginQuery.salesId = uni.getStorageSync('salesId');
94   - var pages = getCurrentPages()
95   - if (pages.length >= 2) {
96   - this.beforePage = pages[pages.length - 2]
97   - }
98   - if (pages.length >= 3) {
99   - this.doubleBeforePage = pages[pages.length - 3]
100   - }
101   - },
102   - methods: {
103   - login() {
104   - let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
105   - if (this.loginQuery.account == '') {
106   - uni.showToast({
107   - title: '请输入手机号！',
108   - duration: 2000,
109   - icon: 'none'
110   - });
111   - } else if (!phoneCodeVerification.test(this.loginQuery.account)) {
112   - uni.showToast({
113   - title: '请输入正确的手机号！',
114   - duration: 2000,
115   - icon: 'none'
116   - });
117   - } else {
118   - const that = this
119   - // uni.showLoading({
120   - // mask: true,
121   - // title: '正在登录...',
122   - // duration: 2000,
123   - // });
124   - NET.request(API.Login, {
125   - type: 2,
126   - phone: this.loginQuery.account,
127   - verificationCode: this.loginQuery.code
128   - }, 'POST').then(res => {
129   - uni.hideLoading()
130   - const item = res.data
131   - uni.setStorageSync('storage_key', item);
132   - if (uni.getStorageSync("salesId")) {
133   - let salesId = uni.getStorageSync("salesId")
134   - let shopId = uni.getStorageSync("shopId")
135   - this.bindSalesCustomer(salesId, shopId)
136   - uni.removeStorageSync('salesId');
137   - uni.removeStorageSync('shopId');
138   - }
139   -
140   - // 购物车右上角数量
141   - NET.request(API.ShoppingCart, {}, 'GET').then(resCart => {
142   - let cartNum = 0
143   - resCart.data.forEach(shopItem => {
144   - shopItem.skus.forEach(goodsItem => {
145   - cartNum += goodsItem.number
146   - })
147   - })
148   - if (cartNum > 0) {
149   - uni.setTabBarBadge({
150   - index: 2,
151   - text: cartNum.toString()
152   - })
153   - }
154   - console.log(cartNum)
155   - uni.setStorageSync('allCartNum', cartNum)
156   - })
157   - if (this.inviteSpelltype == true) {
158   - setTimeout(function () {
159   - uni.reLaunch({
160   - url: '../../pages_category_page1/goodsModule/inviteSpell?collageId=' +
161   - this.inviteSpell.collageId + '&orderId=' + this.inviteSpell
162   - .orderId + '&type=0' + '&productId=' + this.inviteSpell
163   - .productId + '&skuId=' + this.inviteSpell.skuId
164   - })
165   - uni.removeStorageSync('inviteSpell');
166   - }, 2000)
167   - } else {
168   - if (that.beforePage && that.beforePage.route !==
169   - 'pages_category_page2/userModule/accountLogin' &&
170   - that.beforePage.route !== 'pages_category_page2/userModule/login' &&
171   - that.beforePage.route !== 'pages_category_page2/userModule/register') {
172   - console.log(19)
173   - uni.navigateBack({
174   - delta: 1
175   - })
176   - } else if (that.doubleBeforePage && that.doubleBeforePage.route !==
177   - 'pages_category_page2/userModule/accountLogin' &&
178   - that.doubleBeforePage.route !== 'pages_category_page2/userModule/login' &&
179   - that.doubleBeforePage.route !== 'pages_category_page2/userModule/register') {
180   - uni.navigateBack({
181   - delta: 2
182   - })
183   - } else {
184   - NET.request(API.GetUser, {}, 'GET').then(res => {
185   - let MsgList ={
186   - username:res.data.name,
187   - userId:res.data.buyerUserId,
188   - phoneNumber:res.data.phone,
189   - createTime:this.getCurrentDateTime(),
190   - }
191   - NET.request(API.DengJi, MsgList, 'POST').then(res => {
192   -
  53 + const NET = require('../../utils/request')
  54 + const API = require('../../config/api')
  55 + export default {
  56 + data() {
  57 + return {
  58 + loginQuery: {
  59 + account: '',
  60 + code: '',
  61 + salesId: '',
  62 + },
  63 + // 获取验证码
  64 + VerifyQuery: {
  65 + phone: ""
  66 + },
  67 + agreement: false,
  68 + inviteSpell: {},
  69 + inviteSpelltype: false,
  70 + beforePage: undefined,
  71 + doubleBeforePage: undefined,
  72 + text: '获取验证码',
  73 + disabled: false,
  74 + remainingTime: 0, // 剩余倒计时时间
  75 + }
  76 + },
  77 + mixins: [sendVerifyCode],
  78 + onLoad(options) {
  79 + if (options.inviteSpell == 1) {
  80 + this.inviteSpelltype = true
  81 + this.inviteSpell = uni.getStorageSync('inviteSpell');
  82 + }
  83 + this.loginQuery.salesId = uni.getStorageSync('salesId');
  84 + var pages = getCurrentPages()
  85 + if (pages.length >= 2) {
  86 + this.beforePage = pages[pages.length - 2]
  87 + }
  88 + if (pages.length >= 3) {
  89 + this.doubleBeforePage = pages[pages.length - 3]
  90 + }
  91 + },
  92 + methods: {
  93 + login() {
  94 + let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
  95 + if (this.loginQuery.account == '') {
  96 + uni.showToast({
  97 + title: '请输入手机号！',
  98 + duration: 2000,
  99 + icon: 'none'
  100 + });
  101 + } else if (!phoneCodeVerification.test(this.loginQuery.account)) {
  102 + uni.showToast({
  103 + title: '请输入正确的手机号！',
  104 + duration: 2000,
  105 + icon: 'none'
  106 + });
  107 + } else if (this.loginQuery.code == '') {
  108 + uni.showToast({
  109 + title: '请获取验证码！',
  110 + duration: 2000,
  111 + icon: 'none'
193 112 })
194   - })
195   - setTimeout(function () {
196   - uni.switchTab({
197   - url: '../../pages/tabbar/user/index'
198   - })
199   - }, 600)
200   - }
201   - }
202   - }).catch(res => {
203   - console.log('Login failed')
204   - console.dir(res)
205   - uni.hideLoading()
206   - uni.showToast({
207   - title: res.data.message,
208   - duration: 2000,
209   - icon: 'none',
210   - });
211   - })
212   - }
  113 + } else if (!this.agreement) {
  114 + uni.showToast({
  115 + title: '请先阅读并同意《用户服务协议和个人隐私协议》',
  116 + duration: 2000,
  117 + icon: 'none'
  118 + });
  119 + } else {
  120 + const that = this
  121 + // uni.showLoading({
  122 + // mask: true,
  123 + // title: '正在登录...',
  124 + // duration: 2000,
  125 + // });
  126 + NET.request(API.Login, {
  127 + phone: this.loginQuery.account,
  128 + verificationCode: this.loginQuery.code
  129 + }, 'POST').then(res => {
  130 + uni.hideLoading()
  131 + const item = res.data
  132 + uni.setStorageSync('storage_key', item);
  133 + if (uni.getStorageSync("salesId")) {
  134 + let salesId = uni.getStorageSync("salesId")
  135 + let shopId = uni.getStorageSync("shopId")
  136 + this.bindSalesCustomer(salesId, shopId)
  137 + uni.removeStorageSync('salesId');
  138 + uni.removeStorageSync('shopId');
  139 + }
  140 +
  141 + // 购物车右上角数量
  142 + NET.request(API.ShoppingCart, {}, 'GET').then(resCart => {
  143 + let cartNum = 0
  144 + resCart.data.forEach(shopItem => {
  145 + shopItem.skus.forEach(goodsItem => {
  146 + cartNum += goodsItem.number
  147 + })
  148 + })
  149 + if (cartNum > 0) {
  150 + uni.setTabBarBadge({
  151 + index: 2,
  152 + text: cartNum.toString()
  153 + })
  154 + }
  155 + console.log(cartNum)
  156 + uni.setStorageSync('allCartNum', cartNum)
  157 + })
  158 + if (this.inviteSpelltype == true) {
  159 + setTimeout(function() {
  160 + uni.reLaunch({
  161 + url: '../../pages_category_page1/goodsModule/inviteSpell?collageId=' +
  162 + this.inviteSpell.collageId + '&orderId=' + this.inviteSpell
  163 + .orderId + '&type=0' + '&productId=' + this.inviteSpell
  164 + .productId + '&skuId=' + this.inviteSpell.skuId
  165 + })
  166 + uni.removeStorageSync('inviteSpell');
  167 + }, 2000)
  168 + } else {
  169 + if (that.beforePage && that.beforePage.route !==
  170 + 'pages_category_page2/userModule/accountLogin' &&
  171 + that.beforePage.route !== 'pages_category_page2/userModule/login' &&
  172 + that.beforePage.route !== 'pages_category_page2/userModule/register') {
  173 + console.log(19)
  174 + uni.navigateBack({
  175 + delta: 1
  176 + })
  177 + } else if (that.doubleBeforePage && that.doubleBeforePage.route !==
  178 + 'pages_category_page2/userModule/accountLogin' &&
  179 + that.doubleBeforePage.route !== 'pages_category_page2/userModule/login' &&
  180 + that.doubleBeforePage.route !== 'pages_category_page2/userModule/register') {
  181 + uni.navigateBack({
  182 + delta: 2
  183 + })
  184 + } else {
  185 + NET.request(API.GetUser, {}, 'GET').then(res => {
  186 + let MsgList = {
  187 + username: res.data.name,
  188 + userId: res.data.buyerUserId,
  189 + phoneNumber: res.data.phone,
  190 + createTime: this.getCurrentDateTime(),
  191 + }
  192 + NET.request(API.DengJi, MsgList, 'POST').then(res => {
  193 +
  194 + })
  195 + })
  196 + setTimeout(function() {
  197 + uni.switchTab({
  198 + url: '../../pages/tabbar/user/index'
  199 + })
  200 + }, 600)
  201 + }
  202 + }
  203 + }).catch(res => {
  204 + console.log('Login failed')
  205 + console.dir(res)
  206 + uni.hideLoading()
  207 + uni.showToast({
  208 + title: res.data.message,
  209 + duration: 2000,
  210 + icon: 'none',
  211 + });
  212 + })
  213 + }
  214 +
  215 + },
  216 + // 获取时间
  217 + getCurrentDateTime() {
  218 + const now = new Date();
  219 + const year = now.getFullYear();
  220 + const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的，所以需要+1
  221 + const day = String(now.getDate()).padStart(2, '0');
  222 + const hours = String(now.getHours()).padStart(2, '0');
  223 + const minutes = String(now.getMinutes()).padStart(2, '0');
  224 + const seconds = String(now.getSeconds()).padStart(2, '0');
  225 +
  226 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  227 + },
  228 + // 获取验证码
  229 + codede() {
  230 + if (this.disabled) return
  231 + this.getVerify()
213 232  
214   - },
215   - // 获取时间
216   - getCurrentDateTime() {
217   - const now = new Date();
218   - const year = now.getFullYear();
219   - const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的，所以需要+1
220   - const day = String(now.getDate()).padStart(2, '0');
221   - const hours = String(now.getHours()).padStart(2, '0');
222   - const minutes = String(now.getMinutes()).padStart(2, '0');
223   - const seconds = String(now.getSeconds()).padStart(2, '0');
224   -
225   - return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
226   - },
227   - // 获取验证码
228   - codede() {
229   - this.getVerify()
230   - },
231   - getVerify() {
232   - let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
233   - if (this.loginQuery.account == '') {
234   - uni.showToast({
235   - title: '请输入手机号！',
236   - duration: 2000,
237   - icon: 'none'
238   - });
239   - } else if (!phoneCodeVerification.test(this.loginQuery.account)) {
240   - uni.showToast({
241   - title: '请输入正确的手机号！',
242   - duration: 2000,
243   - icon: 'none'
244   - });
245   - } else {
246   - this.VerifyQuery.phone = this.loginQuery.account
  233 + },
  234 + getVerify() {
  235 + let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
  236 + if (this.loginQuery.account === '') {
  237 + uni.showToast({
  238 + title: '请输入手机号！',
  239 + duration: 2000,
  240 + icon: 'none'
  241 + });
  242 + } else if (!phoneCodeVerification.test(this.loginQuery.account)) {
  243 + uni.showToast({
  244 + title: '请输入正确的手机号！',
  245 + duration: 2000,
  246 + icon: 'none'
  247 + });
  248 + } else {
  249 + this.disabled = true;
  250 + this.remainingTime = 60;
  251 + this.text = `${this.remainingTime}s后重试`;
247 252  
248   - NET.request(API.Verify, {
249   - phone: this.VerifyQuery.phone,
250   - }, 'GET').then(res => {
251   - this.sendCode()
252   - }).catch(res => {
253   - uni.showToast({
254   - title: res.data.message,
255   - duration: 1000,
256   - icon: 'none'
257   - });
258   - })
259   - }
  253 + const timer = setInterval(() => {
  254 + this.remainingTime--;
  255 + if (this.remainingTime > 0) {
  256 + this.text = `${this.remainingTime}s后重试`;
  257 + } else {
  258 + clearInterval(timer);
  259 + this.disabled = false; // 倒计时结束，启用按钮
  260 + this.text = '获取验证码';
  261 + }
  262 + }, 1000);
260 263  
261   - },
262   - //绑定关系
263   - bindSalesCustomer(salesId, storeId) {
264   - if (salesId && storeId) {
265   - //如果已登录，静默绑定客户关系，否则跳转到登录页面
266   - NET.request(API.BindSalesCustomer, {
267   - shopId: storeId,
268   - distributorId: salesId
269   - }, 'POST').then(res => {
270   - uni.showToast({
271   - title: "绑定成功",
272   - icon: "none"
273   - })
274   - }).catch(res => {
275   - uni.showToast({
276   - title: res.data.message,
277   - icon: "none"
278   - })
279   - })
  264 + this.VerifyQuery.phone = this.loginQuery.account;
280 265  
281   - }
282   - }
283   - }
284   -}
  266 + NET.request(API.verification, {
  267 + phone: this.VerifyQuery.phone
  268 + }, 'POST').then(res => {
  269 + // 如果 sendCode 方法有实际用途，需要定义该方法
  270 + // this.sendCode();
  271 + console.log(res);
  272 + }).catch(res => {
  273 + uni.showToast({
  274 + title: res.data.message,
  275 + duration: 1000,
  276 + icon: 'none'
  277 + });
  278 + });
  279 + }
  280 + },
  281 + //绑定关系
  282 + bindSalesCustomer(salesId, storeId) {
  283 + if (salesId && storeId) {
  284 + //如果已登录，静默绑定客户关系，否则跳转到登录页面
  285 + NET.request(API.BindSalesCustomer, {
  286 + shopId: storeId,
  287 + distributorId: salesId
  288 + }, 'POST').then(res => {
  289 + uni.showToast({
  290 + title: "绑定成功",
  291 + icon: "none"
  292 + })
  293 + }).catch(res => {
  294 + uni.showToast({
  295 + title: res.data.message,
  296 + icon: "none"
  297 + })
  298 + })
  299 +
  300 + }
  301 + },
  302 + // 多商户用户协议
  303 + protocol(type) {
  304 + uni.navigateTo({
  305 + url: 'protocol?type=' + type
  306 + })
  307 + },
  308 + }
  309 + }
285 310 </script>
286 311  
287 312 <style lang="scss">
288   -.container {
289   - background-color: #FFFFFF;
290   - height: 100vh;
  313 + .container {
  314 + background-color: #FFFFFF;
  315 + height: 100vh;
  316 +
  317 + .login-logoBox {
  318 + margin-top: -300rpx;
  319 +
  320 + .login-logo {
  321 + width: 234rpx;
  322 + height: 193rpx;
  323 + }
  324 + }
291 325  
292   - .login-logoBox {
293   - margin-top: -300rpx;
  326 + .iphoneNum-box {
  327 + margin-top: 100rpx;
  328 + border-bottom: 1rpx solid #DDDDDD;
  329 + height: 100rpx;
  330 + width: 600rpx;
294 331  
295   - .login-logo {
296   - width: 234rpx;
297   - height: 193rpx;
298   - }
299   - }
  332 + .loginIcon {
  333 + width: 40rpx;
  334 + height: 53rpx;
  335 + }
300 336  
301   - .iphoneNum-box {
302   - margin-top: 100rpx;
303   - border-bottom: 1rpx solid #DDDDDD;
304   - height: 100rpx;
305   - width: 600rpx;
  337 + .iphoneNum-input {
  338 + color: #999999;
  339 + font-size: 28rpx;
  340 + font-weight: 400;
  341 + }
  342 + }
306 343  
307   - .loginIcon {
308   - width: 40rpx;
309   - height: 53rpx;
310   - }
  344 + .passwordNum-box {
  345 + border-bottom: 1rpx solid #DDDDDD;
  346 + height: 100rpx;
  347 + width: 600rpx;
311 348  
312   - .iphoneNum-input {
313   - color: #999999;
314   - font-size: 28rpx;
315   - font-weight: 400;
316   - }
317   - }
  349 + .passwordNum-input {
  350 + color: #999999;
  351 + font-size: 28rpx;
  352 + font-weight: 400;
  353 + width: 346rpx;
  354 + }
  355 + }
318 356  
319   - .passwordNum-box {
320   - border-bottom: 1rpx solid #DDDDDD;
321   - height: 100rpx;
322   - width: 600rpx;
  357 + .code-box {
  358 + border-bottom: 1rpx solid #DDDDDD;
  359 + height: 100rpx;
  360 + width: 360rpx;
  361 + display: flex;
  362 + flex-direction: row;
  363 + justify-content: space-between;
  364 + align-items: center;
323 365  
324   - .passwordNum-input {
325   - color: #999999;
326   - font-size: 28rpx;
327   - font-weight: 400;
328   - width: 346rpx;
329   - }
330   - }
  366 + .loginIcon {
  367 + width: 44rpx;
  368 + height: 50rpx;
  369 + }
331 370  
332   - .code-box {
333   - border-bottom: 1rpx solid #DDDDDD;
334   - height: 100rpx;
335   - width: 360rpx;
336   - display: flex;
337   - flex-direction: row;
338   - justify-content: space-between;
339   - align-items: center;
  371 + .code-lab {
  372 + width: 200rpx;
  373 + }
340 374  
341   - .loginIcon {
342   - width: 44rpx;
343   - height: 50rpx;
344   - }
  375 + .codeNum-input {
  376 + color: #999999;
  377 + font-size: 28rpx;
  378 + font-weight: 400;
  379 + }
  380 + }
345 381  
346   - .code-lab {
347   - width: 200rpx;
348   - }
  382 + .getcode {
  383 + background-color: #39be7a;
  384 + height: 100rpx;
  385 + width: 230rpx;
  386 + display: flex;
  387 + flex-direction: row;
  388 + justify-content: center;
  389 + align-items: center;
  390 + margin-left: 20rpx;
  391 + color: #FFFFFF;
  392 + }
349 393  
350   - .codeNum-input {
351   - color: #999999;
352   - font-size: 28rpx;
353   - font-weight: 400;
354   - }
355   - }
  394 + .registerBut {
  395 + background: #3f9b6a;
  396 + color: #FFEBC4;
  397 + height: 100rpx;
  398 + width: 600rpx;
  399 + text-align: center;
  400 + line-height: 100rpx;
  401 + margin-top: 30rpx;
  402 + }
356 403  
357   - .getcode {
358   - background-color: #39be7a;
359   - height: 100rpx;
360   - width: 230rpx;
361   - display: flex;
362   - flex-direction: row;
363   - justify-content: center;
364   - align-items: center;
365   - margin-left: 20rpx;
366   - color: #FFFFFF;
367   - }
  404 + .agreement {
  405 + margin: 100rpx 50rpx;
  406 + line-height: 50rpx;
368 407  
369   - .registerBut {
370   - background: #3f9b6a;
371   - color: #FFEBC4;
372   - height: 100rpx;
373   - width: 600rpx;
374   - text-align: center;
375   - line-height: 100rpx;
376   - margin-top: 30rpx;
377   - }
378   -}
379   -</style>
  408 + image {
  409 + width: 34rpx;
  410 + height: 34rpx;
  411 + margin-right: 15upx;
  412 + }
  413 + }
  414 + }
  415 +</style>
380 416 \ No newline at end of file
... ...
ceres-uniapp-master/pages_category_page2/userModule/collection.vue
  View file @73551aa
... ... @@ -34,7 +34,7 @@
34 34 class="cart-select-img"></image>
35 35 </view>
36 36 <view class="infoCent flex-items">
37   - <image class="product-img default-img" mode="aspectFill" :src="item.image" />
  37 + <image class="product-img default-img" mode="aspectFill" :src="$baseURL+item.image" />
38 38 <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
39 39 <view class="title-wrap mar-left-20 priceBox">
40 40 <text
... ... @@ -107,7 +107,7 @@
107 107 <view class="infoCent">
108 108 <view class="flex-row-plus flex-sp-between flex-items-plus wid">
109 109 <view class="flex-items-plus flex-row pad-topbot-10">
110   - <image class="head-img" mode="aspectFill" :src="item.shopLogo" />
  110 + <image class="head-img" mode="aspectFill" :src="$baseURL+item.shopLogo" />
111 111 <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
112 112 <view class="title-wrap mar-left-20">
113 113 <text class="title u-line-2 shopName">{{ item.shopName }}</text>
... ... @@ -123,7 +123,7 @@
123 123 <view class="itemImgBox" v-for="(sItem, sIndex) of item.productList"
124 124 :key="sIndex"
125 125 @click.stop="goodsDateils(sItem.shopId,sItem.productId,sItem.skuId)">
126   - <image :src="sItem.image" class="pic-img default-img"></image>
  126 + <image :src="$baseURL+sItem.image" class="pic-img default-img"></image>
127 127 </view>
128 128 </view>
129 129 </view>
... ...
ceres-uniapp-master/pages_category_page2/userModule/footprintList.vue
  View file @73551aa
... ... @@ -28,7 +28,7 @@
28 28 <image v-if="item.selected == 1" @click.stop="footItemSel(index,findex,0)" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/selectActive.png" class="cart-select-img"></image>
29 29 <image v-else @click.stop="footItemSel(index,findex,1)" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/selectEmpty.png" class="cart-select-img"></image>
30 30 </view>
31   - <image class="product-img default-img" mode="aspectFill" :src="item.image" />
  31 + <image class="product-img default-img" mode="aspectFill" :src="$baseURL+item.image" />
32 32 <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
33 33 <view class="title-wrap mar-left-20">
34 34 <text class="title u-line-2 fs28">{{ item.productName }}</text>
... ...
ceres-uniapp-master/pages_category_page2/userModule/login.vue
  View file @73551aa
... ... @@ -21,10 +21,10 @@
21 21 <view class="loginBut" v-if="noMp" @click="goLogin">手机号登录</view>
22 22 <!-- #endif -->
23 23 </view>
24   - <view class="flex-row-plus mar-top-30" v-if="noMp">
  24 + <!-- <view class="flex-row-plus mar-top-30" v-if="noMp">
25 25 <text class="font-color-C5AA7B">还没有账号，</text>
26 26 <view class="register-text" @click="goRegister">去注册</view>
27   - </view>
  27 + </view> -->
28 28 </view>
29 29 </template>
30 30  
... ...
ceres-uniapp-master/pages_category_page2/userModule/register.vue
  View file @73551aa
... ... @@ -16,7 +16,7 @@
16 16 maxlength="11" placeholder="请输入您的手机号" />
17 17 </view>
18 18 </view>
19   - <view class="flex-row-plus mar-top-20">
  19 + <view class="flex-row-plus">
20 20 <view class="code-box">
21 21 <view>
22 22 <image class="loginIcon" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/code.png"></image>
... ...
merchant-web-master/src/App.vue
  View file @73551aa
... ... @@ -26,6 +26,25 @@ export default {
26 26 this.getPrivacySwitch();
27 27 }
28 28 },
  29 + computed: {
  30 + fontFaceStyle() {
  31 + return `
  32 + @font-face {
  33 + font-family: 'Alibaba-PuHuiTi-Bold';
  34 + src: url('${this.$fontBold}');
  35 + }
  36 + @font-face {
  37 + font-family: 'Alibaba-PuHuiTi-Regular';
  38 + src: url('${this.$fontRegular}');
  39 + }
  40 + `;
  41 + }
  42 + },
  43 + mounted() {
  44 + const styleElement = document.createElement('style');
  45 + styleElement.innerHTML = this.fontFaceStyle;
  46 + document.head.appendChild(styleElement);
  47 + },
29 48 methods: {
30 49 getPrivacySwitch() {
31 50 getPrivacySwitch().then((res) => {
... ... @@ -406,7 +425,7 @@ export default {
406 425 }
407 426 .bian_css{
408 427 margin:auto;
409   - max-height:600px;
  428 + max-height:720px;
410 429 overflow-y: auto;
411 430 .el-dialog__body {
412 431 padding: 0px;
... ... @@ -418,7 +437,7 @@ export default {
418 437 border-bottom: 1px solid #EFEFEF;
419 438 }
420 439 .el-dialog__title {
421   - font-size: 14px;
  440 + font-size: 18px;
422 441 color: #000000e6;
423 442 }
424 443 .el-date-table td.available:hover{
... ...
merchant-web-master/src/assets/Alibaba-PuHuiTi-Bold.ttf deleted
View file @523cfe1
No preview for this file type
merchant-web-master/src/assets/Alibaba-PuHuiTi-Light.ttf deleted
View file @523cfe1
No preview for this file type
merchant-web-master/src/assets/Alibaba-PuHuiTi-Regular.ttf deleted
View file @523cfe1
No preview for this file type
merchant-web-master/src/assets/font.css
  View file @73551aa
1   -@font-face {
2   - font-family: "Alibaba-PuHuiTi-Regular"; /* Corrected */
  1 +/* @font-face {
  2 + font-family: "Alibaba-PuHuiTi-Regular";
3 3 src: url("./Alibaba-PuHuiTi-Regular.ttf");
4 4 }
5 5  
6 6 @font-face {
7   - font-family: "Alibaba-PuHuiTi-Bold"; /* Corrected */
  7 + font-family: "Alibaba-PuHuiTi-Bold";
8 8 src: url("./Alibaba-PuHuiTi-Bold.ttf");
9   -}
  9 +} */
... ...
merchant-web-master/src/components/Tinymce/components/EditorImage.vue
  View file @73551aa
... ... @@ -46,7 +46,7 @@
46 46 <script>
47 47 // import { getToken } from 'api/qiniu'
48 48 // import db from "@/utils/localstorage";
49   -import { uploadUrl } from '@/utils/request'
  49 +import { upUrl } from '@/utils/request'
50 50 import { getToken } from '@/utils/auth'
51 51 export default {
52 52 name: 'EditorSlideUpload',
... ... @@ -64,7 +64,7 @@ export default {
64 64 headers: {
65 65 'Authorization-business': getToken()
66 66 },
67   - action: uploadUrl,
  67 + action: upUrl,
68 68 dataObj: {
69 69 folderId: 1
70 70 }
... ... @@ -99,7 +99,7 @@ export default {
99 99 const objKeyArr = Object.keys(this.listObj)
100 100 for (let i = 0, len = objKeyArr.length; i < len; i++) {
101 101 if (this.listObj[objKeyArr[i]].uid === uid) {
102   - this.listObj[objKeyArr[i]].url = response.data.url
  102 + this.listObj[objKeyArr[i]].url =this.$baseURL+response.data.url
103 103 this.listObj[objKeyArr[i]].hasSuccess = true
104 104 return
105 105 }
... ...
merchant-web-master/src/layout/components/Sidebar/index.vue
  View file @73551aa
... ... @@ -12,6 +12,7 @@
12 12 :active-text-color="variables.menuActiveText"
13 13 :collapse-transition="false"
14 14 mode="vertical"
  15 + style="padding: 10px 0;"
15 16 >
16 17 <sidebar-item
17 18 v-for="(route,index) in routers"
... ...
merchant-web-master/src/main.js
  View file @73551aa
... ... @@ -21,8 +21,12 @@ Vue.prototype.$encryptall = encryptall;
21 21 let host = window.location.host;
22 22 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' || host === 'localhost:9529') {
23 23 Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
  24 + Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
  25 + Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
24 26 } else {
25 27 Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall`
  28 + Vue.prototype.$fontBold = `${window.location.protocol}//${window.location.host}/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
  29 + Vue.prototype.$fontRegular = `${window.location.protocol}//${window.location.host}/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
26 30 }
27 31 // if (process.env.NODE_ENV === 'production') {
28 32 // const { mockXHR } = require('../mock')
... ...
merchant-web-master/src/utils/request.js
  View file @73551aa
... ... @@ -22,7 +22,7 @@ if (host == &#39;172.16.61.48&#39; || host == &#39;172.16.61.49:5173&#39;) {
22 22 // PREFIX = 'http://8.130.38.56:8027/business-server';
23 23 // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
24 24 // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
25   - PREFIX = 'http://10.0.0.51:9004';
  25 + PREFIX = 'http://192.168.2.138:9004';
26 26 }else{
27 27 // PREFIX = '/merchant-business';
28 28 // PREFIX = 'http://8.130.38.56:9004';
... ... @@ -37,6 +37,7 @@ const service = axios.create({
37 37 timeout: 300000 // request timeout
38 38 })
39 39 export const uploadUrl = `${baseURL}/miniio/upload`
  40 +export const upUrl = `${baseURL}/miniio/uploadQuestion`
40 41 // export const uploadUrl = `${baseURL}/file/upload`
41 42 export const WXuploadUrl = `${baseURL}/file/uploadWxMedia` // 直播上传专用
42 43 //export const QYuploadUrl = `${baseURL}/file/uploadQyMedia` // 微信客服上传专用
... ...
merchant-web-master/src/views/commodity/commodityList/commodityGroup.vue
  View file @73551aa
... ... @@ -44,14 +44,14 @@
44 44 <div class="tableBox">
45 45 <el-table
46 46 ref="multipleTable"
47   - :data="products"
  47 + :data="products.slice((productsPage - 1) * productsPageSize, productsPage * productsPageSize)"
48 48 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
49 49 tooltip-effect="dark"
50   - max-height="400"
  50 +
51 51 >
52 52 <el-table-column label="产品主图" width="220" align="center">
53 53 <template slot-scope="scope">
54   - <img height="80" width="80" :src="scope.row.image " alt srcset>
  54 + <img height="80" width="80" :src="$baseURL+scope.row.image " alt srcset>
55 55 </template>
56 56 </el-table-column>
57 57 <el-table-column prop="productName" label="产品名称" width="220" align="center" />
... ... @@ -59,12 +59,13 @@
59 59 <el-table-column prop="stockNumber" label="库存（件）" align="center" show-overflow-tooltip />
60 60 </el-table>
61 61 <div class="fenye">
  62 + <div style="line-height: 200%;">共{{ products.length}}条</div>
62 63 <el-pagination
63 64 :current-page="productsPage"
64 65 :page-sizes="[5, 10, 20, 50, 100]"
65 66 :page-size="productsPageSize"
66 67 background
67   - layout="prev, pager, next,total"
  68 + layout="prev, pager, next"
68 69 :total="products.length"
69 70 @size-change="handleSizeChange"
70 71 @current-change="handleCurrentChange"
... ... @@ -73,9 +74,9 @@
73 74 </div>
74 75 </div>
75 76 <div class="submitBox">
76   - <el-button style="background-color: #3F9B6A;color: #fff" @click="addGroup('ruleForm')">提 交</el-button>
77 77 <el-button class="buttonHover"
78   - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="closeAddGroup">取 消</el-button>
  78 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="closeAddGroup">取 消</el-button>
  79 + <el-button style="background-color: #3F9B6A;color: #fff" @click="addGroup('ruleForm')">提 交</el-button>
79 80 </div>
80 81 </div>
81 82 </div>
... ... @@ -115,7 +116,7 @@
115 116 :data="shopListData"
116 117 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
117 118 tooltip-effect="dark"
118   - max-height="550"
  119 +
119 120 @selection-change="handleSelectionChange"
120 121 >
121 122 <el-table-column
... ... @@ -131,20 +132,25 @@
131 132 <el-table-column prop="originalPrice" label="价格（元）" align="center" show-overflow-tooltip />
132 133 <el-table-column prop="stockNumber" label="库存（件）" align="center" show-overflow-tooltip />
133 134 </el-table>
134   - <div class="fenye">
  135 + <div class="fenye" style="padding: 10px;">
  136 + <div>共{{ shopTotal }}条</div>
135 137 <el-pagination
136 138 :current-page="formInline.page"
137 139 :page-sizes="[10, 20, 50, 100]"
138 140 :page-size="formInline.pageSize"
139   - layout="total, sizes, prev, pager, next, jumper"
  141 + layout="prev,pager,next"
140 142 :total="shopTotal"
141 143 @size-change="handleSizeChange"
142 144 @current-change="handleCurrentChange"
143 145 />
144   - <span slot="footer" class="dialog-footer">
  146 +
  147 + </div>
  148 + <div class="dialog-footer" style="padding:10px 20px ;">
  149 +
145 150 <el-button type="primary" @click="saveIdList">确 定</el-button>
146   - <el-button @click="closeSelect">取 消</el-button>
147   - </span>
  151 + <el-button @click="closeSelect" class="buttonHover"
  152 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
  153 +
148 154 </div>
149 155 </div>
150 156 </el-dialog>
... ... @@ -207,7 +213,8 @@
207 213 <div class="fenye">
208 214 <span slot="footer" class="dialog-footer">
209 215 <el-button type="primary" @click="saveOptions">确 定</el-button>
210   - <el-button @click="closeOptions">取 消</el-button>
  216 + <el-button @click="closeOptions" class="buttonHover"
  217 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
211 218 </span>
212 219 </div>
213 220 </el-dialog>
... ... @@ -299,7 +306,7 @@ export default {
299 306 },
300 307 products: [], // 确定已选商品
301 308 productsPage: 1,
302   - productsPageSize: 5,
  309 + productsPageSize: 10,
303 310 selectConditions: [], // 当前选择筛选条件
304 311 // 分组选择
305 312 selectGroup: '1',
... ... @@ -633,7 +640,6 @@ export default {
633 640 width: 100%;
634 641 margin: 20px 0;
635 642 display: flex;
636   - justify-content: space-around;
637 643 }
638 644 .isSelectList {
639 645 h3 {
... ... @@ -739,6 +745,8 @@ export default {
739 745 /*}*/
740 746 .fenye {
741 747 margin-top: 30px;
  748 + display: flex;
  749 + justify-content: space-between;
742 750 }
743 751 .fenye /deep/ .dialog-footer {
744 752 margin: 30px auto 0 auto;
... ... @@ -765,6 +773,7 @@ export default {
765 773 .formSearch /deep/ .el-form {
766 774 display: flex;
767 775 flex-wrap: wrap;
  776 + padding: 10px;
768 777 }
769 778 .btnBox /deep/ .el-radio {
770 779 margin-right: 8px;
... ...
merchant-web-master/src/views/commodity/commodityList/index.vue
  View file @73551aa
1 1 <!-- 商品分组 -->
2 2 <template>
3 3 <div style="padding: 0 10px;background-color:#f7f7f7;">
4   - <div class="tab_show">
5   -
  4 + <div class="tab_show" v-if="commidyVisible==false && isVisible==false">
6 5 <!-- 搜索 -->
7 6 <div class="formSearch">
8 7 <el-form :inline="true" :model="formInline" class="demo-form-inline">
... ... @@ -34,7 +33,7 @@
34 33 <template slot-scope="scope">{{ scope.row.number }}</template>
35 34 </el-table-column>
36 35 <el-table-column prop="updateTime" label="修改时间" width="220" />
37   - <el-table-column label="操作" show-overflow-tooltip>
  36 + <el-table-column label="操作" show-overflow-tooltip fixed="right">
38 37 <template slot-scope="scope">
39 38 <div class="btnList">
40 39 <div class="tableBtn greens" @click="edit(scope.row)">
... ... @@ -63,13 +62,8 @@
63 62 </div>
64 63 </div>
65 64 <!-- 新建分组弹框 -->
66   - <el-dialog
67   - :close-on-click-modal="false"
68   - :title="title"
69   - :type="type"
70   - :visible.sync="isVisible"
71   - custom-class="bian_css" width="65%"
72   - top="50px"
  65 + <div
  66 + v-if="isVisible"
73 67 >
74 68 <el-form :model="sizeForm">
75 69 <el-form-item label="分组封面" prop="fileLength" />
... ... @@ -95,22 +89,17 @@
95 89 <el-button @click="isVisible = false">取消</el-button>
96 90 </el-form-item>
97 91 </el-form>
98   - </el-dialog>
  92 + </div>
99 93  
100   - <el-dialog
101   - title="活动报名"
102   - :visible.sync="commidyVisible"
103   - custom-class="bian_css" width="65%"
104   - center
105   - top="10vh"
106   - :close-on-click-modal="false"
  94 + <div
  95 + v-if="commidyVisible"
107 96 >
108 97 <CommGroup
109 98 :group-id="shopGroupId"
110 99 @cancel="commidyVisible = false"
111 100 @reload="search"
112 101 />
113   - </el-dialog>
  102 + </div>
114 103 </div>
115 104 </template>
116 105  
... ... @@ -327,4 +316,28 @@ export default {
327 316 }
328 317 }
329 318 }
  319 +::v-deep .bian_css{
  320 + margin:auto;
  321 + max-height:840px;
  322 + overflow-y: auto;
  323 + .el-dialog__body {
  324 + padding: 0px;
  325 + background-color: #fff;
  326 + }
  327 + .el-dialog__header {
  328 + background-color: #fff;
  329 + padding:10px 20px 10px 20px;
  330 + border-bottom: 1px solid #EFEFEF;
  331 + }
  332 + .el-dialog__title {
  333 + font-size: 14px;
  334 + color: #000000e6;
  335 + }
  336 + .el-date-table td.available:hover{
  337 + background-color:#3F9B6A;
  338 + }
  339 + .el-date-table td.start-date span{
  340 + background-color:#3F9B6A;
  341 + }
  342 + }
330 343 </style>
... ...
merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
  View file @73551aa
... ... @@ -30,7 +30,7 @@
30 30 <!-- 商品 -->
31 31 <div class="addCom common">
32 32 <div v-if="active">
33   - <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding: 40px 40px;">
  33 + <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding:10px 20px;">
34 34 <div class="leftCom">
35 35 <el-form-item label="商品名称" prop="productName">
36 36 <el-input v-model="form.productName" maxlength="50" show-word-limit />
... ... @@ -671,9 +671,10 @@ export default {
671 671 margin: 10px 0;
672 672 justify-content: space-around;
673 673 align-items: unset;
  674 + width: 100%;
674 675 .el-form{
675 676 display: flex;
676   - padding: 40px 0;
  677 + padding: 0px 10px 10px;
677 678 }
678 679 .leftCom {
679 680 width: 65%;
... ...
merchant-web-master/src/views/commodity/commoditySystem/index.vue
  View file @73551aa
... ... @@ -86,7 +86,7 @@
86 86 <el-table-column prop="reject" label="驳回原因" show-overflow-tooltip />
87 87 <el-table-column :formatter="row=>getBrandName(row)" label="品牌" show-overflow-tooltip />
88 88 <el-table-column prop="createTime" label="创建时间" width="180" />
89   - <el-table-column label="操作" width="300">
  89 + <el-table-column label="操作" width="180" fixed="right">
90 90 <template slot-scope="scope">
91 91 <div class="btnList">
92 92 <div @click="edit(scope.row)" class="tableBtn greens" >编辑</div>
... ... @@ -196,7 +196,8 @@
196 196 <el-button type="success" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
197 197 </el-form>
198 198 <span slot="footer" class="dialog-footer">
199   - <el-button @click="vipPriceVisible = false">取 消</el-button>
  199 + <el-button @click="vipPriceVisible = false" class="buttonHover"
  200 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
200 201 <el-button type="primary" @click="vipPriceSubmit">确 定</el-button>
201 202 </span>
202 203 </el-dialog>
... ... @@ -204,9 +205,9 @@
204 205 <el-dialog
205 206 :title="!commId ? '新增商品' : '编辑商品'"
206 207 :visible.sync="commidyVisible"
207   - custom-class="bian_css" width="65%"
  208 + custom-class="bian_css" width="70%"
208 209 center
209   - top="10vh"
  210 + top="6vh"
210 211 :close-on-click-modal="false"
211 212 @before-close="closeModal"
212 213 @close="closeModal"
... ... @@ -673,6 +674,30 @@ export default {
673 674 <style lang='scss' scoped>
674 675 //@import url(); 引入公共css类
675 676 @import url("../../../styles/elDialog.scss");
  677 +::v-deep .bian_css{
  678 + margin:auto;
  679 + max-height:840px;
  680 + overflow-y: auto;
  681 + .el-dialog__body {
  682 + padding: 0px;
  683 + background-color: #fff;
  684 + }
  685 + .el-dialog__header {
  686 + background-color: #fff;
  687 + padding:10px 20px 10px 20px;
  688 + border-bottom: 1px solid #EFEFEF;
  689 + }
  690 + .el-dialog__title {
  691 + font-size: 14px;
  692 + color: #000000e6;
  693 + }
  694 + .el-date-table td.available:hover{
  695 + background-color:#3F9B6A;
  696 + }
  697 + .el-date-table td.start-date span{
  698 + background-color:#3F9B6A;
  699 + }
  700 + }
676 701 .tab_show {
677 702 padding: 0 20px 20px 20px;
678 703 background-color:#fff;
... ... @@ -746,4 +771,5 @@ export default {
746 771 margin-top: 20px;
747 772 }
748 773 }
  774 +
749 775 </style>
... ...
merchant-web-master/src/views/comprehensive/OrderRhq/afterDetails.vue
  View file @73551aa
... ... @@ -7,7 +7,7 @@
7 7 <div class="cotent">
8 8 <div class="left_part">
9 9 <div class="order_info">
10   - <h2>售后信息</h2>
  10 + <TitleWithCircle title="售后信息" style="margin-bottom: 15px;"/>
11 11 <ul>
12 12 <li>
13 13 <p>
... ... @@ -61,7 +61,7 @@
61 61 </ul>
62 62 </div>
63 63 <div class="goods_info">
64   - <h2>商品信息</h2>
  64 + <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
65 65 <div
66 66 v-for="(item, index) in order.products"
67 67 :key="index"
... ... @@ -81,7 +81,7 @@
81 81 <div class="good_details">
82 82 <ul>
83 83 <li>
84   - <img :src="item.image">
  84 + <img :src="$baseURL+item.image">
85 85 <div class="details">
86 86 <p>{{ item.productName }}</p>
87 87 <div class="skuDetails">
... ... @@ -118,7 +118,7 @@
118 118 </div>
119 119 </div>
120 120 <div class="logistics_info">
121   - <h2>售后记录</h2>
  121 + <TitleWithCircle title="售后记录" style="margin-bottom: 15px;"/>
122 122 <div class="after_sales_record">
123 123 <div
124 124 v-for="(item, index) in order.afterHistory"
... ... @@ -319,8 +319,12 @@ import {
319 319 confirmAndRefund,
320 320 damaging
321 321 } from '@/api/order'
  322 +import TitleWithCircle from '@/components/top/index';
322 323 export default {
323 324 name: 'AfterDetails',
  325 + components: {
  326 + TitleWithCircle
  327 + },
324 328 data() {
325 329 return {
326 330 loading: false,
... ...
merchant-web-master/src/views/dashboard/index.vue
  View file @73551aa
... ... @@ -101,7 +101,7 @@ export default {
101 101 this.draws(res.data.conversion)
102 102  
103 103 this.info = d
104   - console.log(d.hotSellProducts)
  104 +
105 105 }
106 106 },
107 107  
... ...
merchant-web-master/src/views/distributor/achievement/humens.vue
  View file @73551aa
... ... @@ -23,7 +23,7 @@
23 23 </el-form-item>
24 24  
25 25 </el-form>
26   - <div>
  26 + <div style="width: 20%;">
27 27 <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
28 28 <el-button class="buttonHover"
29 29 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button>
... ...
merchant-web-master/src/views/distributor/achievement/order.vue
  View file @73551aa
... ... @@ -33,7 +33,7 @@
33 33 </el-select>
34 34 </el-form-item>
35 35 </el-form>
36   - <div> <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
  36 + <div style="width: 20%;"> <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
37 37 <el-button class="buttonHover"
38 38 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button></div>
39 39 </div>
... ...
merchant-web-master/src/views/distributor/achievement/programme.vue
  View file @73551aa
... ... @@ -47,7 +47,7 @@
47 47 >
48 48 <img
49 49 v-if="scope.row.levelLogo"
50   - :src="scope.row.levelLogo"
  50 + :src="$baseURL+scope.row.levelLogo"
51 51 class="avatar"
52 52 >
53 53 <i v-else class="el-icon-plus avatar-uploader-icon" />
... ... @@ -169,7 +169,7 @@ import {
169 169 levelDelete,
170 170 levelUpdateSelf
171 171 } from '@/api/distributor'
172   -import { uploadUrl } from '@/utils/request'
  172 +import { upUrl } from '@/utils/request'
173 173 import { getToken } from '@/utils/auth'
174 174 export default {
175 175 data() {
... ... @@ -179,7 +179,7 @@ export default {
179 179 id: ''
180 180 },
181 181 tableData: [],
182   - action: uploadUrl,
  182 + action: upUrl,
183 183 headers: {
184 184 'Authorization-business': getToken()
185 185 },
... ...
merchant-web-master/src/views/marketing/coupon/add.vue
  View file @73551aa
... ... @@ -128,7 +128,7 @@
128 128 />
129 129 <el-table-column label="产品主图" width="220" align="center">
130 130 <template slot-scope="scope">
131   - <img height="80" width="80" :src="scope.row.image " alt srcset>
  131 + <img height="80" width="80" :src="$baseURL+scope.row.image " alt srcset>
132 132 </template>
133 133 </el-table-column>
134 134 <el-table-column prop="productName" label="产品名称" width="220" />
... ...
merchant-web-master/src/views/order/aftersale/afterDetails.vue
  View file @73551aa
... ... @@ -7,7 +7,7 @@
7 7 <div class="cotent">
8 8 <div class="left_part">
9 9 <div class="order_info">
10   - <h2>售后信息</h2>
  10 + <TitleWithCircle title="售后信息" style="margin-bottom: 15px;"/>
11 11 <ul>
12 12 <li>
13 13 <p>
... ... @@ -61,7 +61,7 @@
61 61 </ul>
62 62 </div>
63 63 <div class="goods_info">
64   - <h2>商品信息</h2>
  64 + <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
65 65 <div
66 66 v-for="(item, index) in order.products"
67 67 :key="index"
... ... @@ -118,7 +118,7 @@
118 118 </div>
119 119 </div>
120 120 <div class="logistics_info">
121   - <h2>售后记录</h2>
  121 + <TitleWithCircle title="售后记录" style="margin-bottom: 15px;"/>
122 122 <div class="after_sales_record">
123 123 <div
124 124 v-for="(item, index) in order.afterHistory"
... ... @@ -319,8 +319,12 @@ import {
319 319 confirmAndRefund,
320 320 damaging
321 321 } from '@/api/order'
  322 +import TitleWithCircle from '@/components/top/index';
322 323 export default {
323 324 name: 'AfterDetails',
  325 + components: {
  326 + TitleWithCircle
  327 + },
324 328 data() {
325 329 return {
326 330 loading: false,
... ...
merchant-web-master/src/views/order/pending/pendDetails.vue
  View file @73551aa
1 1 <template>
2   - <el-dialog :close-on-click-modal="false" title="详情" :visible.sync="visible" custom-class="bian_css" width="65%">
  2 + <el-dialog :close-on-click-modal="false" title="详情" :visible.sync="visible" custom-class="bian_css" width="70%">
3 3 <div v-loading="loading" class="order_details">
4 4 <!-- <el-button icon="el-icon-close" class="close" @click="close" />-->
5 5 <div class="cotent">
6 6 <div class="left_part">
7 7 <div class="order_info">
8   - <h2>订单信息</h2>
  8 + <TitleWithCircle title="订单信息" style="margin-bottom: 15px;"/>
9 9 <ul>
10 10 <li>
11 11 <p>
... ... @@ -58,7 +58,7 @@
58 58 </ul>
59 59 </div>
60 60 <div class="goods_info">
61   - <h2>商品信息</h2>
  61 + <TitleWithCircle title="商品信息" style="margin-bottom: 15px;"/>
62 62 <div
63 63 v-for="(item, index) in order.products"
64 64 :key="index"
... ... @@ -106,7 +106,7 @@
106 106 <!-- 未发货时物流信息显示去发货按钮 -->
107 107 <!-- <div class="logistics_info" v-show="order.logisticsName && order.logisticsNum"> -->
108 108 <div class="logistics_info">
109   - <h2>物流信息</h2>
  109 + <TitleWithCircle title="物流信息" style="margin-bottom: 15px;"/>
110 110 <!-- <p
111 111 v-if="!order.logisticsNum"
112 112 class="send_good"
... ... @@ -138,7 +138,7 @@
138 138 </div>
139 139 <div class="right_part">
140 140 <div class="pay_order_info">
141   - <h2>下单人信息</h2>
  141 + <TitleWithCircle title="下单人信息" style="margin-bottom: 15px;"/>
142 142 <p>下单账户: {{ order.customerName }}</p>
143 143 <p>历史订单总数: {{ order.total }}个</p>
144 144 <p>下单备注: {{ order.remark }}</p>
... ... @@ -200,8 +200,12 @@
200 200  
201 201 <script>
202 202 import { orderGetById, orderGetSelect, orderDilevery } from '@/api/order'
  203 +import TitleWithCircle from '@/components/top/index';
203 204 export default {
204 205 name: 'PendDetails',
  206 + components: {
  207 + TitleWithCircle
  208 + },
205 209 data() {
206 210 return {
207 211 visible: false,
... ... @@ -224,7 +228,8 @@ export default {
224 228 ]
225 229 },
226 230 companyList: [],
227   - orderId: 0
  231 + orderId: 0,
  232 + loading:false
228 233 }
229 234 },
230 235 // computed: {
... ...
merchant-web-master/src/views/salesSta/dataSta.vue
  View file @73551aa
... ... @@ -232,10 +232,11 @@
232 232 <el-table-column prop="multiply" label="销售金额" :sortable="true" :sort-method="sortMethod"/>
233 233 </el-table>
234 234 <div class="fenye">
  235 + <div>共{{ total }}条</div>
235 236 <el-pagination
236 237 :current-page="currentPage"
237 238 :page-size="10"
238   - layout="prev, pager, next,total"
  239 + layout="prev, pager, next"
239 240 :total="total"
240 241 @current-change="handleCurrentChange"
241 242 />
... ... @@ -426,7 +427,7 @@ border:1px solid #EBEEF5;
426 427 .fenye{
427 428 margin-top: 20px;
428 429 display: flex;
429   - justify-content: flex-end;
  430 + justify-content: space-between;
430 431 }
431 432 .titleTj{
432 433 width:100%;
... ...
merchant-web-master/src/views/stockControl/inventory/index.vue
  View file @73551aa
... ... @@ -90,7 +90,7 @@
90 90 </template>
91 91 </el-table-column>
92 92 <el-table-column prop="createTime" label="创建时间" width="180" />
93   - <el-table-column label="操作" width="200">
  93 + <el-table-column label="操作" width="200" fixed="right">
94 94 <template slot-scope="scope">
95 95 <div class="btnList">
96 96 <div class="tableBtn greens" @click="edit(scope.row)">编辑</div>
... ... @@ -141,6 +141,7 @@
141 141 width="70%"
142 142 center
143 143 custom-class="bian_css"
  144 + top="6vh"
144 145 :close-on-click-modal="false"
145 146 @before-close="closeModal"
146 147 @close="closeModal"
... ... @@ -168,15 +169,15 @@
168 169 </el-radio-group>
169 170 </el-form-item>
170 171 <div class="priceTable">
171   - <table>
172   - <tr>
173   - <th>规格</th>
174   - <th>售价</th>
  172 + <table >
  173 + <tr >
  174 + <th >规格</th>
  175 + <th >售价</th>
175 176 <th v-for="(item,index) in gradeList" :key="index">
176 177 {{ item }}
177 178 </th>
178 179 </tr>
179   - <tr v-for="(item,index) in productData" :key="index">
  180 + <tr v-for="(item,index) in productData" :key="index" >
180 181 <td>
181 182 {{ item.value }}
182 183 </td>
... ... @@ -189,11 +190,12 @@
189 190 </tr>
190 191 </table>
191 192 </div>
192   - <el-button type="success" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
  193 + <el-button style="background-color: #3F9B6A;color: #fff;" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
193 194 </el-form>
194 195 <span slot="footer" class="dialog-footer">
195   - <el-button @click="vipPriceVisible = false">取 消</el-button>
196   - <el-button type="primary" @click="vipPriceSubmit">确 定</el-button>
  196 + <el-button @click="vipPriceVisible = false" class="buttonHover"
  197 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
  198 + <el-button style="background-color: #3F9B6A;color: #fff;" @click="vipPriceSubmit">确 定</el-button>
197 199 </span>
198 200 </el-dialog>
199 201 <el-dialog
... ... @@ -221,7 +223,8 @@
221 223 </el-form-item>
222 224 </el-form>
223 225 <span slot="footer" class="dialog-footer">
224   - <el-button @click="rukuShow = false">取 消</el-button>
  226 + <el-button @click="rukuShow = false" class="buttonHover"
  227 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
225 228 <el-button type="primary" @click="rukuCheck">确 定</el-button>
226 229 </span>
227 230 </el-dialog>
... ... @@ -698,9 +701,9 @@ export default {
698 701 border-top: 1px solid #EBEEF5;
699 702 th{
700 703 padding: 12px 0;
701   - background: #EEF3FF;
702   - color: #333;
703   - border-right: 1px solid #EBEEF5;
  704 + background: #F2F3F5;
  705 + color: #0009;
  706 + border-right: 1px solid #F2F3F5;
704 707 }
705 708 td{
706 709 padding: 12px 0;
... ... @@ -726,4 +729,28 @@ export default {
726 729 margin-top: 20px;
727 730 }
728 731 }
  732 +::v-deep .bian_css{
  733 + margin:auto;
  734 + max-height:840px;
  735 + overflow-y: auto;
  736 + .el-dialog__body {
  737 + padding: 0px;
  738 + background-color: #fff;
  739 + }
  740 + .el-dialog__header {
  741 + background-color: #fff;
  742 + padding:10px 20px 10px 20px;
  743 + border-bottom: 1px solid #EFEFEF;
  744 + }
  745 + .el-dialog__title {
  746 + font-size: 14px;
  747 + color: #000000e6;
  748 + }
  749 + .el-date-table td.available:hover{
  750 + background-color:#3F9B6A;
  751 + }
  752 + .el-date-table td.start-date span{
  753 + background-color:#3F9B6A;
  754 + }
  755 + }
729 756 </style>
... ...
merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
  View file @73551aa
... ... @@ -91,11 +91,12 @@
91 91  
92 92 </el-table>
93 93 <div class="fenye">
  94 + <div>共{{total}}条</div>
94 95 <el-pagination
95 96 :current-page="currentPage"
96 97 :page-sizes="[5, 10, 20, 50, 100]"
97 98 :page-size="10"
98   - layout="prev, pager, next,total, sizes, jumper"
  99 + layout="prev, pager, next"
99 100 :total="total"
100 101 @size-change="handleSizeChange"
101 102 @current-change="handleCurrentChange"
... ... @@ -125,7 +126,8 @@
125 126 </el-form>
126 127 </div>
127 128 <span slot="footer" class="dialog-footer">
128   - <el-button @click="handleClose" style="color: #000;border-color:#d5d5d5;">取消</el-button>
  129 + <el-button @click="handleClose" class="buttonHover"
  130 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
129 131 <el-button @click="kucunSet" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
130 132  
131 133 </span>
... ... @@ -307,7 +309,7 @@ border:1px solid #EBEEF5;
307 309 .fenye {
308 310 margin-top: 20px;
309 311 display: flex;
310   - justify-content: flex-end;
  312 + justify-content: space-between;
311 313 }
312 314 ::v-deep .setclass{
313 315 .el-dialog__header{
... ...
merchant-web-master/src/views/system/shopSys/edit.vue
  View file @73551aa
... ... @@ -24,7 +24,7 @@
24 24 <div class="shopLogon">
25 25 <!-- 上传图片 -->
26 26 <div class="uploadWidth">
27   - <el-upload
  27 + <!-- <el-upload
28 28 :headers="headers"
29 29 :action="upload"
30 30 list-type="picture-card"
... ... @@ -35,7 +35,9 @@
35 35 </el-upload>
36 36 <el-dialog :visible.sync="dialogVisible">
37 37 <img width="100%" :src="dialogImageUrl" alt>
38   - </el-dialog>
  38 + </el-dialog> -->
  39 + <upimg filePath="bueniss" :value="shopObj.shopLogo" inputtype="coverImage" :limit="1"
  40 + @changimg="e=>changimg(e,'shopLogo')"></upimg>
39 41 </div>
40 42 </div>
41 43 <div class="common">
... ... @@ -52,7 +54,7 @@
52 54 </div>
53 55 <div class="common">
54 56 <div class="span_1">注册手机号：</div>
55   - <el-input v-model="shopObj.phone" placeholder="请输入注册手机号" />
  57 + <el-input v-model.number="shopObj.phone" placeholder="请输入注册手机号" />
56 58 </div>
57 59 </div>
58 60 <div class="shopDetail_r">
... ... @@ -67,7 +69,7 @@
67 69 </div>
68 70 <div class="common">
69 71 <div class="span_1">联系电话</div>
70   - <el-input v-model="shopObj.phone" placeholder="请输入联系电话" />
  72 + <el-input v-model.number="shopObj.phone" placeholder="请输入联系电话" />
71 73 </div>
72 74 </div>
73 75 </div>
... ... @@ -79,8 +81,11 @@
79 81 <script>
80 82 import { uploadUrl } from '@/utils/request'
81 83 import { getToken } from '@/utils/auth'
  84 +import upimg from "@/components/ImageUpload/index"
82 85 export default {
83   - components: {},
  86 + components: {
  87 + upimg
  88 + },
84 89 data() {
85 90 // 这里存放数据
86 91 return {
... ... @@ -100,6 +105,10 @@ export default {
100 105 },
101 106 // 方法集合
102 107 methods: {
  108 +
  109 + changimg(e, type) {
  110 + this.shopObj[type] = e
  111 + },
103 112 handleRemove(file, fileList) {
104 113 console.log(file, fileList)
105 114 },
... ...
merchant-web-master/src/views/system/shopSys/index.vue
  View file @73551aa
... ... @@ -3,7 +3,8 @@
3 3 <div class="tab_show">
4 4 <el-form ref="ruleForm" :model="storeDetails" :rules="rules" label-width="100px">
5 5 <div class="h5">
6   - <div class="title">店铺信息</div>
  6 + <!-- <div class="title">店铺信息</div> -->
  7 + <TitleWithCircle title="店铺信息" style="margin-bottom: 15px;flex: 1;"/>
7 8 <!-- <el-button
8 9 v-if="!disabled1"
9 10 type="text"
... ... @@ -23,7 +24,11 @@
23 24 </div>
24 25 <div class="shop-details">
25 26 <el-form-item label="店铺logo">
26   - <el-upload
  27 + <img :src="$baseURL+storeDetails.shopLogo" class="shopLogon" v-if="disabled1" style="width: 100px;height: 100px;"/>
  28 + <upimg filePath="bueniss" :value="storeDetails.shopLogo" inputtype="coverImage" :limit="1"
  29 + @changimg="e=>changimg(e,'shopLogo')" v-else></upimg>
  30 +
  31 + <!-- <el-upload
27 32 :class="[{ 'avatar-uploader': !storeDetails.shopLogo }]"
28 33 :headers="headers"
29 34 :data="dataObj"
... ... @@ -40,7 +45,7 @@
40 45 height="80"
41 46 >
42 47 <i v-else class="el-icon-plus avatar-uploader-icon" />
43   - </el-upload>
  48 + </el-upload> -->
44 49 </el-form-item>
45 50 <el-form-item label="店铺名称">
46 51 <el-input v-model="storeDetails.shopName" :disabled="disabled1" />
... ... @@ -77,14 +82,16 @@
77 82 </el-form-item>
78 83 </div>
79 84 <div class="h5">
80   - <div class="title">店铺认证</div>
  85 + <!-- <div class="title">店铺认证</div> -->
  86 + <TitleWithCircle title="店铺认证" style="margin-bottom: 15px;"/>
81 87 </div>
82 88 <div class="shop-details" style="overflow: hidden; line-height: 40px">
83 89 微信支付-商户认证
84 90 <!-- <el-button type="primary" style="float:right" @click="approve">立即认证</el-button> -->
85 91 </div>
86 92 <div class="h5">
87   - <div class="title">退货地址</div>
  93 + <!-- <div class="title">退货地址</div> -->
  94 + <TitleWithCircle title="退货地址" style="margin-bottom: 15px;"/>
88 95 </div>
89 96 <div class="shop-details">
90 97 <el-form-item label="地址">
... ... @@ -123,8 +130,14 @@
123 130 import { shopSysGetById, shopSysUpdate } from '@/api/shopSys';
124 131 import { uploadUrl } from '@/utils/request';
125 132 import { getToken } from '@/utils/auth';
  133 +import upimg from "@/components/ImageUpload/index"
  134 +import TitleWithCircle from '@/components/top/index';
126 135 const PhoneRule = /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/
127 136 export default {
  137 + components: {
  138 + upimg,
  139 + TitleWithCircle
  140 + },
128 141 data() {
129 142 return {
130 143 form: {
... ... @@ -180,6 +193,9 @@ export default {
180 193 this.privacyTime = localStorage.getItem('privacyTime');
181 194 },
182 195 methods: {
  196 + changimg(e, type) {
  197 + this.storeDetails[type] = e
  198 + },
183 199 focusReturnPhoneInput() {
184 200 // 处理后端没有返回shopReturn字段
185 201 if (!this.storeDetails.shopReturn) {
... ...