修改订单流程

.idea/.gitignore

+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

.idea/b2b-applet-taizhou.iml

+<?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

.idea/modules.xml

+<?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

.idea/vcs.xml

+<?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

config/api.js

@@ -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) => {

config/server_config.js

@@ -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",   /* 根域名 */

locale/en.json

@@ -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",

locale/zh-Hans.json

@@ -53,6 +53,8 @@
 	"index.account-current": "当前账号",
 	"index.platform-switch-confirm": "确认切换",
 
+	"index.schedule": "集采计划",
+
 
 	"index.contact": "联系人",
 	"index.telephone": "联系电话",

pages.json

 {
-	"pages": [{
+  "pages": [
+    {
       "path": "pages/home/index",
       "style": {
         "navigationBarTitleText": "%index.home%",
@@ -19,6 +20,13 @@
         "padding-bottom": 0
       }
     },
+    {
+      "path": "pages/schedule/index",
+      "style": {
+        "navigationBarTitleText": "%index.schedule%",
+        "enablePullDownRefresh": true
+      }
+    },
     {
       "path": "pages/sort/index",
       "style": {
@@ -206,13 +214,15 @@
       "style": {
         "navigationBarTitleText": "%index.privacy-policy%"
       }
-		}, {
+    },
+    {
       "path": "pages/mine/changePlat",
       "style": {
         "navigationBarTitleText": "%index.platform-switch%",
         "enablePullDownRefresh": false
       }
-		}, {
+    },
+    {
       "path": "pages/carrier/index",
       "style": {
         "navigationBarTitleText": "%index.select-carrier%",
@@ -257,11 +267,59 @@
       }
     },
     {
-			"path" : "pages/web/web",
-			"style" : 
+      "path": "pages/web/web",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/marginManagement/index",
+      "style": {
+        "navigationBarTitleText": " 集采保证金审核",
+        "enablePullDownRefresh": true
+      }
+    },
     {
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+      "path": "pages/marginDetail/schedule-edit",
+      "style": {
+        "navigationBarTitleText": " 集采计划详情",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/marginDetail/index",
+      "style": {
+        "navigationBarTitleText": " 集采保证金详情",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/turnOrder/index",
+      "style": {
+        "navigationBarTitleText": " 集采转订单",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/auctionSpecial/index",
+      "style": {
+        "navigationBarTitleText": "竞拍专场",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/verify/buyer",
+      "style": {
+        "navigationBarTitleText": "竞拍专场买家保证金审核",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/verify/seller",
+      "style": {
+        "navigationBarTitleText": "店铺竞拍商品审核 ",
+        "enablePullDownRefresh": true
       }
     }
   ],
@@ -279,7 +337,8 @@
     "selectedColor": "#B60001",
     "borderStyle": "white",
     "backgroundColor": "#FFFFFF",
-		"list": [{
+    "list": [
+      {
         "pagePath": "pages/home/index",
         "text": "%index.home%",
         "iconPath": "static/tabbar/home.png",
@@ -299,12 +358,19 @@
       }
     ]
   },
-	"condition": { //模式配置，仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [{
-			"name": "", //模式名称
-			"path": "", //启动页面，必选
-			"query": "" //启动参数，在页面的onLoad函数里面得到
-		}]
+  "condition": {
+    //模式配置，仅开发期间生效
+    "current": 0,
+    //当前激活的模式(list 的索引项)
+    "list": [
+      {
+        "name": "",
+        //模式名称
+        "path": "",
+        //启动页面，必选
+        "query": ""
+        //启动参数，在页面的onLoad函数里面得到
+      }
+		]
 	}
 }

pages/home/index.vue

@@ -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%;
 		}
 	}
+	.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>