Skip to content

W
wly-APP
Commit 1f445b2b authored by chuan.liu's avatar chuan.liu
Browse files
Options

市场秩序 违约处理详情联调 创意酒产品信息联调

parent 5c9cfe35
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6096 additions and 4047 deletions
manifest.json
View file @ 1f445b2b
...@@ -106,8 +106,9 @@ ...@@ -106,8 +106,9 @@
"changeOrigin": true "changeOrigin": true
}, },
"/crm-app": { "/crm-app": {
"target": "http://10.0.135.139", "target": "http://10.0.135.61",
// "target" : "http://10.2.4.2", // "target": "http://10.0.135.139",
// "target": "http://221.10.127.60:5000",
"changeOrigin": true "changeOrigin": true
}, },
"/wmdpwebservices": { "/wmdpwebservices": {
......
pages/breakwords-handle/breakwords-handle.nvue
View file @ 1f445b2b
...@@ -548,6 +548,7 @@ ...@@ -548,6 +548,7 @@
} }
.empty-block { .empty-block {
width: 750rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
......
pages/breakwords-market/breakwords-market.nvue
View file @ 1f445b2b
<template> <template>
<view class="lists"> <view class="lists">
<view class="status_bar" :style="navHeight"></view> <view class="status_bar" :style="navHeight"></view>
<view class="header-bg"> <!-- <view class="header-bg">
<!-- <image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image> --> <image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
</view> </view> -->
<view class="main" :style="mainHeight"> <view class="main" :style="mainHeight">
<view class="navs-block"> <view class="navs-block">
<view class="navs-tab"> <view class="navs-tab">
...@@ -21,22 +21,22 @@ ...@@ -21,22 +21,22 @@
<view class="search-type"> <view class="search-type">
<picker class="picker-block" @change="bindPickerTypesChange" range-key='name' mode="selector" <picker class="picker-block" @change="bindPickerTypesChange" range-key='name' mode="selector"
:value="viloationTypeSelected.name" :range="violationTypeData"> :value="viloationTypeSelected.name" :range="violationTypeData">
<text class="uni-input">{{viloationTypeSelected.name}}</text> <text class="uni-input-text">{{viloationTypeSelected.name}}</text>
</picker> </picker>
<image class="icon-arrow-down" src="@/static/image/arrow_down@3x.png" mode=""></image> <image class="icon-arrow-down" src="@/static/image/arrow_down@3x.png" mode=""></image>
<view class="icon-line"></view> <view class="icon-line"></view>
</view> </view>
<view class="search-input-block"> <view class="search-input-block">
<image class="icon-search" src="@/static/image/search_b@3x.png" mode=""></image> <image class="icon-search" src="@/static/image/search_b@3x.png" mode=""></image>
<input class="search-input" type="text" @blur="getClueList" v-model="condition.productId" <input class="search-input" type="text" placeholder-class="uni-combox__input-plac"
placeholder="请输入产品ID" /> @blur="getClueList" v-model="condition.productId" placeholder="请输入产品ID" />
</view> </view>
</view> </view>
<view class="search-block" v-if="activeTabIndex===1"> <view class="search-block" v-if="activeTabIndex===1">
<view class="search-input-block"> <view class="search-input-block">
<image class="icon-search" src="@/static/image/search_b@3x.png" mode=""></image> <image class="icon-search" src="@/static/image/search_b@3x.png" mode=""></image>
<input class="search-input" type="text" @blur="getClueList" v-model="condition.pwd" <input class="search-input" type="text" placeholder-class="uni-combox__input-plac"
placeholder="请输入口令进行查询" /> @blur="getClueList" v-model="condition.pwd" placeholder="请输入口令进行查询" />
</view> </view>
</view> </view>
</view> </view>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
}, },
scrollHeight() { scrollHeight() {
return { return {
'height': `${this.sysinfo.safeArea.height - 44 - 90 }px` 'height': `${this.sysinfo.safeArea.height - 44 - 30 }px`
} }
}, },
...@@ -182,7 +182,9 @@ ...@@ -182,7 +182,9 @@
if (this.activeTabIndex === 0) { if (this.activeTabIndex === 0) {
this.condition.submitMethod = 'REAL_NAME' this.condition.submitMethod = 'REAL_NAME'
this.condition.viloationTypes[0] = this.viloationTypeSelected.code if (this.viloationTypeSelected.code) {
this.condition.viloationTypes[0] = this.viloationTypeSelected.code
}
const { const {
pwd, pwd,
...other ...other
...@@ -288,15 +290,17 @@ ...@@ -288,15 +290,17 @@
.header-bg { .header-bg {
height: 284rpx; height: 284rpx;
opacity: 0.72;
margin-top: -88rpx; margin-top: -88rpx;
background-color: #fff;
} }
.header-bg-img { .header-bg-img {
width: 750rpx; width: 750rpx;
} }
.status_bar {
background-color: #fff;
}
.lists { .lists {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
...@@ -307,7 +311,8 @@ ...@@ -307,7 +311,8 @@
.main { .main {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
margin-top: -164rpx; padding-top: 40rpx;
background-color: #fff;
} }
.navs-block { .navs-block {
...@@ -355,6 +360,8 @@ ...@@ -355,6 +360,8 @@
} }
.search-block { .search-block {
flex: 1;
width: 750rpx;
height: 120rpx; height: 120rpx;
padding: 24rpx 16rpx; padding: 24rpx 16rpx;
} }
...@@ -388,7 +395,7 @@ ...@@ -388,7 +395,7 @@
.search-input-block { .search-input-block {
display: flex; display: flex;
flex: 1 1 auto; flex: 1;
align-items: center; align-items: center;
background: #f5f6f7; background: #f5f6f7;
border-radius: 0 8rpx 8rpx 0; border-radius: 0 8rpx 8rpx 0;
...@@ -401,6 +408,15 @@ ...@@ -401,6 +408,15 @@
margin-right: 12rpx; margin-right: 12rpx;
} }
.search-input {
flex: 1;
}
.uni-input-placeholder {
color: #DBDBDB;
font-size: 12px;
}
.middle { .middle {
background-color: #fff; background-color: #fff;
border-radius: 16rpx; border-radius: 16rpx;
...@@ -441,12 +457,11 @@ ...@@ -441,12 +457,11 @@
position: relative; position: relative;
border-radius: 4px; border-radius: 4px;
align-items: center; align-items: center;
line-height: normal;
} }
.uni-input-placeholder { .uni-combox__input-plac {
color: #DBDBDB; color: #DBDBDB;
font-size: 12px; font-size: 14px;
} }
.uni-list-cell { .uni-list-cell {
...@@ -465,6 +480,7 @@ ...@@ -465,6 +480,7 @@
.uni-input-text { .uni-input-text {
font-size: 14px; font-size: 14px;
line-height: 60rpx;
color: #888; color: #888;
} }
...@@ -608,6 +624,7 @@ ...@@ -608,6 +624,7 @@
} }
.empty-block { .empty-block {
width: 750rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
......
pages/breakwords-mission/breakwords-mission.nvue
View file @ 1f445b2b
...@@ -30,26 +30,30 @@ ...@@ -30,26 +30,30 @@
<text class="item-block-label">共 {{loadParams.total}} 项</text> <text class="item-block-label">共 {{loadParams.total}} 项</text>
</view> </view>
<view class="block-detal"> <view class="block-detal">
<view class="block-detal-no">编号：{{item.ticketId}}</view>
<view class="block-detal-head"> <view class="block-detal-head">
<text <text
class="detal-head-item-value detal-head-item-value-first">{{item.auditTime}}</text> class="detal-head-item-value detal-head-item-value-first">{{item.createdate}}</text>
<text class="detal-head-item-value">{{item.viloationTypeName}}</text> <text class="detal-head-item-value">{{item.viloationName}}</text>
<text class="detal-head-item-value">{{item.childTypeName}}</text> <text class="detal-head-item-value">{{item.childTypeName}}</text>
<text <text
class="detal-head-item-value detal-head-item-value-last status-done">{{item.statusName}}</text> class="detal-head-item-value detal-head-item-value-last status-done">{{item.status}}</text>
</view> </view>
<view class="block-detal-body"> <view class="block-detal-body">
<text class="detal-item-value">{{item.terminalName}}</text> <text class="detal-item-value">{{item.terminalName}}</text>
<text class="detal-item-value">{{item.terminalAddress}}</text> <text class="detal-item-value">{{item.terminalAddress}}</text>
<text class="detal-item-value">{{item.platformName}}</text> <text class="detal-item-value">{{item.productName}}</text>
<text class="detal-item-value">{{item.storeName}}</text> <text class="detal-item-value">{{item.productQty}}</text>
<view class="detal-item-value" v-for="(product,index2) in item.entries" :key='index2'> <!-- <view class="detal-item-value" v-for="(product,index2) in item.entries" :key='index2'>
<text class="product-val">{{product.productName}}</text> <text class="product-val">{{product.productName}}</text>
<text class="product-val">{{product.barcodeTypeName}}</text> <text class="product-val">{{product.barcodeTypeName}}</text>
<text class="product-val"> {{product.barcode}}</text> <text class="product-val"> {{product.barcode}}</text>
</view> </view> -->
</view> </view>
</view> </view>
<button v-if="handleStatustext(item) !=='--'" class="item-btn" type="default"
@click="checkOrderStatus(item)"><text
class="item-btn-text">{{handleStatustext(item)}}</text></button>
</view> </view>
</cell> </cell>
<cell> <cell>
...@@ -76,7 +80,8 @@ ...@@ -76,7 +80,8 @@
} from 'vuex' } from 'vuex'
import { import {
apiGetMissionList apiGetMissionList,
apiGetClueList
} from '@/servers/breakwords.js' } from '@/servers/breakwords.js'
export default { export default {
...@@ -127,6 +132,7 @@ ...@@ -127,6 +132,7 @@
created() { created() {
this.condition.userId = this.userInfo.code this.condition.userId = this.userInfo.code
this.reset() this.reset()
this.getClueList()
}, },
methods: { methods: {
async getClueList(isRefresh) { async getClueList(isRefresh) {
...@@ -155,12 +161,14 @@ ...@@ -155,12 +161,14 @@
uni.hideLoading(); uni.hideLoading();
}, 2000); }, 2000);
const res = await apiGetMissionList(params) const res = await apiGetMissionList(params)
// const res = await apiGetClueList()
uni.hideLoading(); uni.hideLoading();
const { const {
count, count,
pagesize, pagesize,
data data,
results
} = res.data } = res.data
this.loadParams.total = count this.loadParams.total = count
this.loadParams.totalPage = Math.ceil(count * 1 / pagesize * 1) this.loadParams.totalPage = Math.ceil(count * 1 / pagesize * 1)
...@@ -216,6 +224,35 @@ ...@@ -216,6 +224,35 @@
checkTab(i) { checkTab(i) {
this.activeTabIndex = i this.activeTabIndex = i
this.getClueList() this.getClueList()
},
handleStatustext(item) {
let text = '--'
switch (item.entryType) {
case 1:
text = '填写收货'
break
case 4:
text = '确认收货'
break
case 3:
text = '罚分申诉'
break
}
return text
},
checkOrderStatus(item) {
let entryType = ''
switch (item.entryType) {
case 1:
entryType = '2'
break
case 4:
entryType = '5'
break
case 3:
entryType = '6'
break
}
} }
} }
} }
...@@ -255,7 +292,7 @@ ...@@ -255,7 +292,7 @@
} }
.scroll-area { .scroll-area {
background: #f0f4f5; background: #fff;
} }
.navs-block { .navs-block {
...@@ -381,12 +418,12 @@ ...@@ -381,12 +418,12 @@
} }
.scroll-item { .scroll-item {
position: relative;
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: 32rpx; padding: 0 64rpx 0 48rpx;
border-radius: 16rpx; background-color: #fff;
padding: 32rpx 64rpx 40rpx 48rpx;
} }
.planout-block-item__last { .planout-block-item__last {
...@@ -443,6 +480,10 @@ ...@@ -443,6 +480,10 @@
margin-top: 32rpx; margin-top: 32rpx;
} }
.block-detal-no {
margin-bottom: 10px;
}
.block-detal-head { .block-detal-head {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -485,6 +526,28 @@ ...@@ -485,6 +526,28 @@
margin-bottom: 8rpx; margin-bottom: 8rpx;
} }
.item-btn {
position: absolute;
right: 94rpx;
bottom: 24rpx;
height: 32px;
line-height: 30px;
background: #f61d30;
border-radius: 8px;
padding-top: 0;
padding-bottom: 0;
}
.item-btn:after {
border: 0;
}
.item-btn-text {
color: #fff;
font-size: 24rpx;
}
.btn { .btn {
flex: 1; flex: 1;
height: 92rpx; height: 92rpx;
...@@ -512,6 +575,7 @@ ...@@ -512,6 +575,7 @@
} }
.empty-block { .empty-block {
width: 750rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
......
pages/diy-wine/diy-wine.nvue → pages/diy-wine/diy-wine.vue
View file @ 1f445b2b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="header-bg"> <view class="header-bg">
<image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image> <image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
</view> </view>
<view class="main"> <view class="main" :style="scrollHeight">
<view class="img-block view"> <view class="img-block view">
<button class="img-block-submit" type="default" :disabled="!isEdit" @click="handleSave">完成</button> <button class="img-block-submit" type="default" :disabled="!isEdit" @click="handleSave">完成</button>
<image class="img-block-bottle" :src="goodsBottleImage" mode="aspectFit"></image> <image class="img-block-bottle" :src="goodsBottleImage" mode="aspectFit"></image>
...@@ -28,34 +28,34 @@ ...@@ -28,34 +28,34 @@
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='item.PRODUCT_ID' <view class="middle view planout-block-item" v-for="(item,index) in lists" :key='item.PRODUCT_ID'
@click="handleChecked($event,item, index)"> @click="handleChecked($event,item, index)">
<text class="item-name">五粮液/八代系列/(191)52%</text> <text class="item-name">{{orderDetail.ITEM.DESCRIPTION}}</text>
<view class="text-block"> <view class="text-block">
<text class="middle-date middle-date-select">定制数量</text> <text class="middle-date middle-date-select">定制件数</text>
<text class="middle-date-des middle-date-des-select">2</text> <text class="middle-date-des middle-date-des-select">{{orderDetail.ITEM.ZZFLD000009}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date middle-date-select">收货方名称</text> <text class="middle-date middle-date-select">收货方名称</text>
<text class="middle-date-des middle-date-des-select">3</text> <text class="middle-date-des middle-date-des-select">{{orderDetail.INFO.ZZFLD00008T}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date middle-date-select">联系人</text> <text class="middle-date middle-date-select">联系人</text>
<text class="middle-date-des middle-date-des-select">2</text> <text class="middle-date-des middle-date-des-select">{{orderDetail.INFO.ZZFLD00002L}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date middle-date-select">地址</text> <text class="middle-date middle-date-select">地址</text>
<text class="middle-date-des middle-date-des-select">广东省惠州市龙门县平安大道99号s</text> <text class="middle-date-des middle-date-des-select">{{orderDetail.INFO.ZZFLD00002N}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date middle-date-select">CRM订单号</text> <text class="middle-date middle-date-select">CRM订单号</text>
<text class="middle-date-des middle-date-des-select">2</text> <text class="middle-date-des middle-date-des-select">{{orderDetail.INFO.OBJECT_ID}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date middle-date-select">经销商名称</text> <text class="middle-date middle-date-select">经销商名称</text>
<text class="middle-date-des middle-date-des-select">2</text> <text class="middle-date-des middle-date-des-select">{{orderDetail.INFO.BUSINAME}}</text>
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<text class="middle-date middle-date-select">外箱喷码内容</text> <text class="middle-date middle-date-select">外箱喷码内容</text>
<text class="middle-date-des middle-date-des-select">2</text> <text class="middle-date-des middle-date-des-select">{{orderDetail.INFO.ZZFLD000098}}</text>
</view> </view>
</view> </view>
...@@ -103,11 +103,21 @@ ...@@ -103,11 +103,21 @@
"SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F", "SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F",
"Sign": "b4eeef27e8dbb663bab932d742dc425f" "Sign": "b4eeef27e8dbb663bab932d742dc425f"
}, },
toPageParams: { orderDetail: {
page: '', ITEM: {
mode: '', DESCRIPTION: '',
index: 0, ZZFLD000009: '',
head: {} DESCRIPTION: '',
DESCRIPTION: '',
},
INFO: {
ZZFLD00008T: '',
ZZFLD00002L: '',
ZZFLD00002N: '',
OBJECT_ID: '',
BUSINAME: '',
ZZFLD000098: '',
}
} }
} }
}, },
...@@ -120,10 +130,15 @@ ...@@ -120,10 +130,15 @@
}, },
scrollHeight() { scrollHeight() {
return { return {
'height': `${this.sysinfo.safeArea.height - 237- 44 - 20}px` 'height': `${this.sysinfo.safeArea.height - 44 - 20}px`
} }
} }
}, },
onLoad(option) {
if (option && option.orderDetail) {
this.orderDetail = JSON.parse(option.orderDetail)
}
},
created() { created() {
this.getCategory() this.getCategory()
}, },
...@@ -294,9 +309,8 @@ ...@@ -294,9 +309,8 @@
.lists { .lists {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
overflow-y: scroll;
background: #f0f4f5; background: #f0f4f5;
overflow-x: hidden; overflow: hidden;
height: 100vh; height: 100vh;
} }
...@@ -304,6 +318,7 @@ ...@@ -304,6 +318,7 @@
position: relative; position: relative;
flex-direction: column; flex-direction: column;
margin-top: -164rpx; margin-top: -164rpx;
overflow-y: scroll;
} }
.img-block { .img-block {
...@@ -315,8 +330,9 @@ ...@@ -315,8 +330,9 @@
} }
.img-block-bottle { .img-block-bottle {
width: 100%;
margin: auto; margin: auto;
height: 700rpx; height: 100%;
} }
.img-block-logo { .img-block-logo {
......
pages/home/home.vue
View file @ 1f445b2b
...@@ -119,8 +119,9 @@ ...@@ -119,8 +119,9 @@
color: ['#FDB95A', '#528FF4', '#FF7282', '#C38AFF', '#FFD600'], color: ['#FDB95A', '#528FF4', '#FF7282', '#C38AFF', '#FFD600'],
enableScroll: true, enableScroll: true,
xAxis: { xAxis: {
itemCount: 4, disableGrid: true,
disableGrid: true itemCount: 3,
fontSize: 12
}, },
yAxis: { yAxis: {
"dashLength": 20, "dashLength": 20,
......
pages/login/login.nvue
View file @ 1f445b2b
...@@ -58,7 +58,8 @@ ...@@ -58,7 +58,8 @@
data() { data() {
return { return {
account: '0050000215', account: '0050000215',
password: 'DO1tjHPW0Z', // password: 'DO1tjHPW0Z',
password: 'Wly12345',
phone: '', phone: '',
code: '', code: '',
loginType: 'password', loginType: 'password',
......
pages/my-order/order-item.nvue
View file @ 1f445b2b
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
.item-block-btn__text { .item-block-btn__text {
width: 180rpx; width: 180rpx;
height: 48rpx; height: 48rpx;
text-align: center;
line-height: 48rpx; line-height: 48rpx;
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
......
pages/order-detail-group/order-detail-group.nvue
View file @ 1f445b2b
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
}, },
goDiyPage() { goDiyPage() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/diy-wine/diy-wine" url: `/pages/diy-wine/diy-wine?orderDetail=${JSON.stringify(this.orderDetail)}`
}) })
} }
} }
...@@ -328,6 +328,7 @@ ...@@ -328,6 +328,7 @@
width: 180rpx; width: 180rpx;
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
text-align: center;
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
} }
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 1f445b2b
...@@ -276,6 +276,7 @@ ...@@ -276,6 +276,7 @@
.title-info__status-text { .title-info__status-text {
width: 180rpx; width: 180rpx;
text-align: center;
font-size: 12px; font-size: 12px;
} }
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 1f445b2b
...@@ -310,6 +310,7 @@ ...@@ -310,6 +310,7 @@
.title-info__status-text { .title-info__status-text {
width: 180rpx; width: 180rpx;
text-align: center;
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
} }
......
servers/api.helper.js
View file @ 1f445b2b
...@@ -34,12 +34,13 @@ class Request { ...@@ -34,12 +34,13 @@ class Request {
options.params = options.params || {}; options.params = options.params || {};
options.header = Object.assign({}, this.config.header, options.header); options.header = Object.assign({}, this.config.header, options.header);
options.method = options.method || this.config.method; options.method = options.method || this.config.method;
options.sslVerify = false
// console.log('api.helper-----request', options, this.options) // console.log('api.helper-----request', options, this.options)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
options.complete = (response) => { options.complete = (response) => {
// console.log('api.helper---options.complete', response) console.log('api.helper---options.complete', response)
// 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading) // 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading)
uni.hideLoading(); uni.hideLoading();
// 清除定时器，如果请求回来了，就无需loading // 清除定时器，如果请求回来了，就无需loading
...@@ -135,7 +136,7 @@ class Request { ...@@ -135,7 +136,7 @@ class Request {
constructor() { constructor() {
this.config = { this.config = {
baseUrl: 'http://10.0.135.139', // 请求的根域名 baseUrl: 'http://10.0.135.61', // 请求的根域名
// 默认的请求头 // 默认的请求头
header: {}, header: {},
method: 'POST', method: 'POST',
...@@ -147,6 +148,7 @@ class Request { ...@@ -147,6 +148,7 @@ class Request {
loadingText: '请求中...', loadingText: '请求中...',
loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
timer: null, // 定时器 timer: null, // 定时器
sslVerify: false, // 定时器
originalData: false, // 是否在拦截器中返回服务端的原始数据，见文档说明 originalData: false, // 是否在拦截器中返回服务端的原始数据，见文档说明
loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透 loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
} }
...@@ -155,21 +157,27 @@ class Request { ...@@ -155,21 +157,27 @@ class Request {
this.interceptor = { this.interceptor = {
// 请求前的拦截 // 请求前的拦截
request: (config) => { request: (config) => {
config.header['Authorization'] = `Basic ${Base64.encode('wangpc:LZY888@@')}`; // config.header['Authorization'] = `Basic ${Base64.encode('wangpc:LZY888@@')}`;
try { try {
if (config.url.indexOf('crm-app/login') === - if (config.url.indexOf('crm-app/login') === -
1 && 1 &&
store.state.vuex_token) { store.state.vuex_token) {
config.header['X-Auth-Token'] = store.state.vuex_token config.header['X-Auth-Token'] = store
.state.vuex_token
} }
config.header['Content-Type'] = "application/json; charset=utf-8"
// config.header['Content-Type'] = "application/x-www-form-urlencoded"
if (config.url.indexOf('crm-app') !== -1) { if (config.url.indexOf('crm-app') !== -1) {
config.baseUrl = 'http://10.0.135.139' config.baseUrl = 'http://10.0.135.61'
} else if (config.url.indexOf('adapter') !== -1) { } else if (config.url.indexOf('adapter') !== -1) {
config.baseUrl = 'http://api.c0331.dev.guanyingyun.com' config.baseUrl = 'http://api.c0331.dev.guanyingyun.com'
} else if (config.url.indexOf('wmdpwebservices') !== -1) {
config.baseUrl = 'https://10.0.134.182:9002'
// config.baseUrl = ''
} else { } else {
// config.baseUrl = 'http://10.0.135.139/wlySap' // config.baseUrl = 'http://10.0.135.139/wlySap'
config.baseUrl = 'http://10.0.134.45:8000' config.baseUrl = 'http://10.0.134.182:8000'
} }
} catch (e) { } catch (e) {
console.log('error', e) console.log('error', e)
......
servers/http.interceptor.js
View file @ 1f445b2b
...@@ -11,14 +11,17 @@ const install = (Vue, vm) => { ...@@ -11,14 +11,17 @@ const install = (Vue, vm) => {
// 设置为true后，就需要在this.$u.http.interceptor.response进行多一次的判断，请打印查看具体值 // 设置为true后，就需要在this.$u.http.interceptor.response进行多一次的判断，请打印查看具体值
// originalData: true, // originalData: true,
// 设置自定义头部content-type // 设置自定义头部content-type
header: {} header: {
"Content-Type": "application/json; charset=utf-8",
}
}); });
// 请求拦截，配置Token等参数 // 请求拦截，配置Token等参数
http.interceptor.request = (config) => { http.interceptor.request = (config) => {
config.header['Authorization'] = `Basic ${Base64.encode('wangpc:LZY888@@')}`; config.header['Authorization'] = `Basic ${Base64.encode('wangpc:LZY888@@')}`;
if (config.url.indexOf('crm-app/login') === -1 && vm.$store if (config.url.indexOf('crm-app/login') === -1 && vm.$store
.state.vuex_token) { .state.vuex_token) {
config.header['X-Auth-Token'] = vm.$store.state.vuex_token; config.header['X-Auth-Token'] = vm.$store.state
.vuex_token;
} }
// if (config.url.indexOf('crm-app') !== -1) { // if (config.url.indexOf('crm-app') !== -1) {
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 1f445b2b
This diff is collapsed.
unpackage/dist/dev/app-plus/app-view.js
View file @ 1f445b2b
This diff is collapsed.
unpackage/dist/dev/app-plus/pages/apply-delivery/apply-delivery.js
View file @ 1f445b2b
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/apply-order/apply-order.js
View file @ 1f445b2b
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/login/login.js
View file @ 1f445b2b
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/plan/plan.js
View file @ 1f445b2b
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/usercenter/usercenter.js
View file @ 1f445b2b
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment