提交 da44b2a1 authored 作者: 宋雄's avatar 宋雄

修改订单流程

# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/b2b-applet-taizhou.iml" filepath="$PROJECT_DIR$/.idea/b2b-applet-taizhou.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
......@@ -5,6 +5,21 @@ import {
* params 参数 <object>
*config 配置项 <object> 可传 {header: {}, custom: {load: false}}
*/
//图片
export const downloadFileById = (id, config = {}) => {
return new Promise((resolve, reject) => {
http.get('/api/file/file/findListByIds/'+id, {
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
//平台切换
......@@ -521,7 +536,218 @@ export const getBuyerList = (params, config = {}) => {
})
})
}
// 集采列表
export const getSchedule = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post('/api/business/centralizedPurchasingSchedule/list', {
...params
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 集采保证金列表
export const getCentralizedPurchasingRegisterList = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post('/api/business/centralizedPurchasingRegister/list', {
...params
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
export const centralizedPurchasingSchedule = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.get(`/api/business/centralizedPurchasingSchedule/getOne/${params.id}`, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 集采保证金详情
export const centralizedPurchasingRegister = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.get(`/api/business/centralizedPurchasingRegister/getOne/${params.id}`, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 集采保证金审核
export const centralizedPurchasingRegisterAudit = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post('/api/business/centralizedPurchasingRegister/audit', {
...params
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 集采转销售
export const centralizedPurchasingRegisterSales = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post('/api/business/centralizedPurchasingSchedule/sales', {
...params
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 集采上架下架
export const scheduleUpdateStatus = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.get(`/api/business/centralizedPurchasingSchedule/updateStatus/${params.id}/${params.value}`, {
...params
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 集采按id删除
export const scheduleDelete = (id, config = {}) => {
return new Promise((resolve, reject) => {
http.get(`/api/business/centralizedPurchasingSchedule/delete/${id}`, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 竞价专场分页
export const auctionSpecialPage = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post('/api/business/auctionSpecial/page', {
...params
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 新增竞价专场
export const auctionSpecialUpdateStatus = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.get(`/api/business/auctionSpecial/updateStatus/${params.id}/${params.value}`, {
...params
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 查询竞价专场/{id}
export const auctionSpecialGet = (id, config = {}) => {
return new Promise((resolve, reject) => {
http.get(`/api/business/auctionSpecial/get/${id}`, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 查询竞价专场/{id}
export const findAuctionMarginInfo = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post(`/api/business/auction/findAuctionMarginInfo?businessId=${params.businessId}&businessTypes=${params.businessTypes}&page=${params.page}&rows=${params.rows}`, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
export const pageAudit = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post(`/api/business/auction/pageAudit?specialId=${params.specialId}&page=${params.page}&rows=${params.rows}`, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 买家保证金审核
export const auditBuyerMarginInfo = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post(`/api/business/auction/auditAuctionMarginInfo`, {
...params
}, {
...config
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
})
}
// 购物车提交订单
export const generateOrder = (params, config = {}) => {
return new Promise((resolve, reject) => {
......@@ -1758,7 +1984,7 @@ export const couponGet = (params, config = {}) => {
})
}
// 注册提交账号信息
// 注册提交账号信息
export const registerFirstStep = (params, config = {}) => {
return new Promise((resolve, reject) => {
http.post("/api/customer/customerRetained/save", {
......@@ -1858,4 +2084,4 @@ export const getShopType = (params, config = {}) => {
reject(err)
})
})
}
\ No newline at end of file
}
......@@ -2,8 +2,7 @@
* 接口参数
*/
const serverConfig = {
// baseURL: "http://116.148.227.177:8760",
baseURL: "http://test.supew.com",
baseURL: "http://test.supew.com/",
// baseURL: "http://www.supew.com/",
/* 根域名 */
// baseURL: "http://114.67.111.37:8001", /* 根域名 */
......@@ -12,4 +11,4 @@ const serverConfig = {
platform_name: encodeURI('中国台州直集采中心'),
platform_short_code: 'P00001'
}
export default serverConfig
\ No newline at end of file
export default serverConfig
......@@ -55,6 +55,8 @@
"index.account-current": "Current account",
"index.platform-switch-confirm": "Confirm switch",
"index.schedule": "Centralized purchase plan",
"index.contact": "Contact",
"index.telephone": "Telephone",
"index.warehouse-detail": "Warehouse detailed address",
......@@ -689,4 +691,4 @@
"index.policy-11": "alter",
"index.policy-11.1": "The Platform may revise the terms of this Privacy Policy from time to time, and such amendments form part of this Privacy Policy. If such amendments result in a material reduction of the user's rights under this Privacy Policy, the Platform will notify the user by a prominent position on the homepage or by other means before the amendment takes effect. In this case, if the user continues to use the services of this platform, he/she agrees to be bound by this revised Privacy Policy."
}
\ No newline at end of file
}
......@@ -53,6 +53,8 @@
"index.account-current": "当前账号",
"index.platform-switch-confirm": "确认切换",
"index.schedule": "集采计划",
"index.contact": "联系人",
"index.telephone": "联系电话",
......@@ -690,4 +692,4 @@
"index.policy-10.1": "除某些特定服务外,本平台所有的服务均适用本《隐私政策》。这些特定服务将适用特定的隐私政策。针对某些特定服务的特定隐私政策,将更具体地说明本平台在该等服务中如何使用用户的信息。该特定服务的隐私政策构成本《隐私政策》的一部分。 如相关特定服务的隐私政策与本《隐私政策》有不一致之处,适用该特定服务的隐私政策。除本《隐私政策》另有规定外,本《隐私条款》所用词语将与《中国台州直集采中心客户平台交易总则》所定义的词语具有相同的涵义。",
"index.policy-11": "变更",
"index.policy-11.1": "本平台可能适时修订本《隐私政策》的条款,该等修订构成本《隐私政策》的一部分。如该等修订造成用户在本《隐私政策》下权利的实质减少,本平台将在修订生效前通过在主页上显著位置提示或以其他方式通知用户。在该种情况下,若用户继续使用本平台的服务,即表示同意受经修订的本《隐私政策》的约束。"
}
\ No newline at end of file
}
差异被折叠。
差异被折叠。
......@@ -55,6 +55,27 @@
<uni-load-more :status="listStatus" :contentText="contentText"></uni-load-more>
<xzj-firsthint :isCustom="false" /> -->
<!-- 集采 竞拍-->
<view class="quick-entry">
<view class="item" @click="quickEntry(1)" v-if="isPlatformType">
<span class="icon">
</span>
<text>集采专场</text>
</view>
<view class="item" @click="quickEntry(2)" v-if="isPlatformType">
<span class="icon">
</span>
<text>竞拍专场</text>
</view>
<view class="item" @click="quickEntry(3)" >
<span class="icon">
</span>
<text>循环盘</text>
</view>
</view>
</view>
<no-data :show="nodata"></no-data>
</view>
......@@ -80,6 +101,7 @@
},
data() {
return {
userInfo: JSON.parse(uni.getStorageSync('userInfo')),
icon: web('logo_title.png'),
page: 1,
p: 1, //源头货源
......@@ -95,6 +117,7 @@
nodata: false,
showControls: false,
video: null,
isPlatformType:false,
contentText: {
contentdown: this.$t('index.pull.more'),
contentrefresh: this.$t('index.pull.loading'),
......@@ -102,8 +125,35 @@
}
}
},
created() {
if(this.userInfo.userCurrentPlat.platformType.indexOf('operator') !== -1){
this.isPlatformType = true
}
},
methods: {
quickEntry(num){
let isLogin = uni.getStorageSync('userInfo')
if(isLogin){
console.log('isLogin',isLogin)
if(num == 1){
uni.navigateTo({
url: '/pages/schedule/index'
})
}else if(num == 2){
uni.navigateTo({
url: '/pages/auctionSpecial/index'
})
}else if(num == 3){
uni.navigateTo({
url: '/pages/circular/index'
})
}
}else {
uni.navigateTo({
url: '/pages/login/index?url=' + encodeURIComponent('/pages/home/index')
})
}
},
stopTouchMove() {
return false
},
......@@ -509,4 +559,58 @@
height: 100%;
}
}
</style>
\ No newline at end of file
.quick-entry {
background-color: #ffffff;
padding: 40rpx 30rpx 0;
border-radius: 16rpx;
display: flex;
flex-wrap: wrap;
margin-top: 30rpx;
.item {
width: 25%;
display: flex;
flex-flow: column;
align-items: center;
justify-content: center;
margin-bottom: 40rpx;
.item-img {
position: relative;
font-size: 0;
.num {
position: absolute;
top: -5px;
left: 75%;
font-size: 20rpx;
color: #FFFFFF;
padding: 2px 4px;
background-color: #F6C864;
border-radius: 20rpx;
min-width: 20rpx;
text-align: center;
}
}
.icon {
width: 90rpx;
height: 90rpx;
display: block;
background: #B60001;
color: #fff;
border-radius: 10rpx;
text-align: center;
line-height: 90rpx;
}
text {
margin-top: 12rpx;
font-size: 28rpx;
color: #373737;
}
}
}
</style>
差异被折叠。
差异被折叠。
差异被折叠。
差异被折叠。
差异被折叠。
差异被折叠。
差异被折叠。
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论