2023-11-8

api/hall.js

@@ -12,7 +12,7 @@ export function auction_gu(data) {
 //查看场次列表
 export function auction_list(data) {
 	return request({
-		url: '/api/auction_list',
+		url: '/api/auction',
 		method: 'get',
 		data
 	});
@@ -21,7 +21,7 @@ export function auction_list(data) {
 //预约场次
 export function subscribe(data) {
 	return request({
-		url: '/api/auction/subscribe',
+		url: `/api/auction/${data.id}`,
 		method: 'post',
 		data
 	});

api/user.js

@@ -123,8 +123,8 @@ export function link(data) {
 // 获取我的粉丝
 export function getMyfans(data) {
 	return request({
-		url: '/api/auction/lower',
+		url: '/api/spread/people',
-		method: 'get',
+		method: 'POST',
 		data
 	});
 }

manifest.json

@@ -113,8 +113,7 @@
             "proxy" : {
                 "/api" : {
                     // "target" : "http://test.shangshigo.com", //请求的目标域名
-
+                    "target" : "http://jp.frp.qiniu1314.com", //请求的目标域名
-                    "target": "http://jp.frp.qiniu1314.com", //请求的目标域名
                     "changeOrigin" : true
                 }
             }

pages.json

@@ -2,83 +2,7 @@
 	"easycom": {
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [{
+	"pages": [
-			"path": "pages/navigation/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef MP
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-				// #endif
-				"navigationBarTitleText": "尚视易趣"
-			}
-		},
-		{
-			"path": "pages/navigation/main",
-			"style": {
-				"navigationBarTitleText": "卖货系统"
-			}
-		},
-		{
-			"path": "pages/navigation/product",
-			"style": {
-				"navigationBarTitleText": "产品详情"
-			}
-		},
-		{
-			"path": "pages/navigation/productlist",
-			"style": {
-				"navigationBarTitleText": "产品列表"
-			}
-		},
-		{
-			"path": "pages/navigation/bdjj",
-			"style": {
-				"navigationBarTitleText": "报单奖金",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/navigation/tdjj",
-			"style": {
-				"navigationBarTitleText": "团队奖金",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/navigation/fhsy",
-			"style": {
-				"navigationBarTitleText": "分红收益",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/navigation/team",
-			"style": {
-				"navigationBarTitleText": "我的团队",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -161,7 +85,7 @@
 		{
 			"path": "pages/collection/collection",
 			"style": {
-				"navigationBarTitleText": "银行卡管理"
+				"navigationBarTitleText": "支付方式管理"
 			}
 		},
 		{
@@ -298,6 +222,12 @@
 				"navigationBarTitleText": "官方公告"
 			}
 		},
+		{
+			"path": "pages/index/artDetail",
+			"style": {
+				"navigationBarTitleText": "详情"
+			}
+		},
 		{
 			"path": "pages/index/messageInfo",
 			"style": {
@@ -478,7 +408,10 @@
 		{
 			"path": "pages/order/order",
 			"style": {
-				"navigationBarTitleText": "我的订单"
+				"navigationBarTitleText": "我的订单",
+				"app-plus": {
+					"titleNView": false
+				}
 			}
 		},
 		{
@@ -702,40 +635,16 @@
 				"text": "首页"
 			},
 			{
-				"pagePath": "pages/category/category",
+				"pagePath": "pages/hall/halllist",
 				"iconPath": "static/tabBar/tab-cate.png",
 				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "分类"
+				"text": "参赛"
 			},
 			{
-				"pagePath": "pages/cart/cart",
+				"pagePath": "pages/order/order",
 				"iconPath": "static/tabBar/tab-pink.png",
 				"selectedIconPath": "static/tabBar/tab-pink-current.png",
-				"text": "购物车"
+				"text": "我的订单"
-			},
-			// {
-			// 	"pagePath": "pages/product/new",
-			// 	"iconPath": "static/tabBar/tab-cart.png",
-			// 	"selectedIconPath": "static/tabBar/tab-cart-current.png",
-			// 	"text": "新品"
-			// },
-			{
-				"pagePath": "pages/hall/hall",
-				// "iconPath": "static/tabBar/tab-cart.png",
-				// "selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "趣豆会馆"
-			},
-			{
-				"pagePath": "pages/order/index",
-				// "iconPath": "static/tabBar/tab-cart.png",
-				// "selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "订单"
-			},
-			{
-				"pagePath": "pages/money/money",
-				// "iconPath": "static/tabBar/tab-cart.png",
-				// "selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "财务"
 			},
 			{
 				"pagePath": "pages/user/user",

utils/newRequest.js

@@ -118,119 +118,115 @@ let service = {
 				data: requestData.data,
 				file_name: requestData.data.file_name || 'user/' + store.state.user.userInfo.uid
 			}
-			uni.showLoading({
+			// uni.showLoading({
-				title: '请求key中',
+			// 	title: '请求key中',
-				mark: true,
+			// 	mark: true,
-			})
+			// })
 			try {
-				const {
+				// const {
-					data
+				// 	data
-				} = await getUpimgKey({
+				// } = await getUpimgKey({
-					file_name: config.file_name
+				// 	file_name: config.file_name
-				})
+				// })
-				uni.hideLoading()
+				// uni.hideLoading()
-				setTimeout(()=>{
+				// setTimeout(()=>{
-					uni.chooseImage({
+				uni.chooseImage({
-						count: 1,
+					count: 1,
-						sizeType: ['compressed'],
+					sizeType: ['compressed'],
-						sourceType: ['camera', 'album'],
+					sourceType: ['camera', 'album'],
-						success(res) {
+					success(res) {
-							uni.showLoading({
+						uni.showLoading({
-								title: '上传中',
+							title: '上传中',
-								mark: true,
+							mark: true,
-							})
+						})
-							try{
+						try {
-								// console.log(res, '选中图片');
+							// console.log(res, '选中图片');
-								const time = (new Date()).getTime();
+							const time = (new Date()).getTime();
-								// #ifdef H5
+							// #ifdef H5
-								const formData = {
+							const formData = {
-									"policy": data.sign.policy,
+								// "policy": data.sign.policy,
-									"OSSAccessKeyId": data.sign.accessid,
+								// "OSSAccessKeyId": data.sign.accessid,
-									'success_action_status': 200,
+								// 'success_action_status': 200,
-									"signature": data.sign.signature,
+								// "signature": data.sign.signature,
-									"key": config.file_name + '/' + time + res.tempFiles[0]
+								"key": config.file_name + '/' + time + res.tempFiles[0]
-										.name
+									.name
-								}
-								// #endif
-								// #ifndef H5
-								const formData = {
-									"policy": data.sign.policy,
-									"OSSAccessKeyId": data.sign.accessid,
-									'success_action_status': 200,
-									"signature": data.sign.signature,
-									"key": config.file_name + '/' + time + '.png'
-								}
-								// #endif
-								// console.log(formData,'formData');
-								uni.uploadFile({
-									url: data.sign.host, //仅为示例，非真实的接口地址
-									filePath: res.tempFilePaths[0],
-									formData,
-									name: 'file',
-									header: {
-										"Authori-zation": 'Bearer ' + uni
-											.getStorageSync('token')
-									},
-									success: (suc) => {
-										if (suc.statusCode == 200) {
-											// #ifdef H5
-											const imgurl = [{
-												url: data.sign.host + '/' +
-													config.file_name + '/' +
-													time + res.tempFiles[0]
-													.name
-											}];
-											// #endif
-											// #ifndef H5
-											const imgurl = [{
-												url: data.sign.host + '/' +
-													config.file_name + '/' +
-													time + '.png'
-											}];
-											// #endif
-											resolve(imgurl)
-										}
-										uni.hideLoading()
-									},
-									file(res) {
-										uni.hideLoading()
-										// console.log(res, '图片上传错误');
-										reject(res)
-									}
-													
-								});
-							}catch(e){
-								uni.showModal({
-									title: '错误',
-									content: e.message,
-									showCancel: false
-								});
 							}
-							
+							// #endif
-						},
+							// #ifndef H5
-						fail(err) {
+							const formData = {
-							if (err.errCode == 0) {
+								// "policy": data.sign.policy,
-								uni.showToast({
+								// "OSSAccessKeyId": data.sign.accessid,
-									title: '已取消',
+								// 'success_action_status': 200,
-									icon: "error"
+								// "signature": data.sign.signature,
-								});
+								"key": config.file_name + '/' + time + '.png'
-							} else if (err.errCode == 12) {
-								uni.showToast({
-									title: '已返回',
-									icon: "error"
-								});
-							} else {
-								console.log(err, '图片上传错误');
-								uni.showToast({
-									title: '请重新上传',
-									icon: "error"
-								});
 							}
-							uni.hideLoading()
+							// #endif
-							reject(err)
+							// console.log(formData,'formData');
+							uni.uploadFile({
+								url: url, //仅为示例，非真实的接口地址
+								filePath: res.tempFilePaths[0],
+								formData,
+								name: 'file',
+								header: {
+									"Authori-zation": 'Bearer ' + uni
+										.getStorageSync('token')
+								},
+								success: (suc) => {
+									if (suc.statusCode == 200) {
+										suc.data = JSON.parse(suc.data).data;
+										// #ifdef H5
+										const imgurl = [{
+											url:suc.data.url
+										}];
+										// #endif
+										// #ifndef H5
+										const imgurl = [{
+											url:suc.data.url
+										}];
+										// #endif
+										resolve(imgurl)
+									}
+									uni.hideLoading()
+								},
+								file(res) {
+									uni.hideLoading()
+									// console.log(res, '图片上传错误');
+									reject(res)
+								}
+
+							});
+						} catch (e) {
+							uni.showModal({
+								title: '错误',
+								content: e.message,
+								showCancel: false
+							});
 						}
-					})
+
+					},
+					fail(err) {
+						if (err.errCode == 0) {
+							uni.showToast({
+								title: '已取消',
+								icon: "error"
+							});
+						} else if (err.errCode == 12) {
+							uni.showToast({
+								title: '已返回',
+								icon: "error"
+							});
+						} else {
+							console.log(err, '图片上传错误');
+							uni.showToast({
+								title: '请重新上传',
+								icon: "error"
+							});
+						}
+						uni.hideLoading()
+						reject(err)
+					}
 				})
+				// })
 			} catch (e) {
 				uni.hideLoading()
 				uni.showToast({

utils/tabbar.js

@@ -1,36 +1,3 @@
-export const tabbar = [{
-		pagePath: "/pages/index/index",
-		iconPath: require('@/static/tabBar/tab-home.png'),
-		selectedIconPath: require("@/static/tabBar/tab-home-current.png"),
-		text: "首页"
-	},
-	{
-		pagePath: "/pages/order/index",
-		iconPath: require("@/static/tabBar/tab-order.png"),
-		selectedIconPath: require("@/static/tabBar/tab-order-current.png"),
-		text: "订单"
-	},
-	{
-		pagePath: "/pages/hall/hall",
-		iconPath: require("@/static/tabBar/qd.png"),
-		selectedIconPath: require("@/static/tabBar/qd.png"),
-		text: "易趣会馆",
-		midButton: true,
-	},
-	{
-		pagePath: "/pages/money/money",
-		iconPath: require("@/static/tabBar/tab-money.png"),
-		selectedIconPath: require("@/static/tabBar/tab-money-current.png"),
-		text: "财务"
-	},
-	{
-		pagePath: "/pages/user/user",
-		iconPath: require("@/static/tabBar/tab-my.png"),
-		selectedIconPath: require("@/static/tabBar/tab-my-current.png"),
-		text: "我的"
-	},
-]
-
 export const tabbar1 = [{
 		pagePath: "/pages/index/index",
 		iconPath: require('@/static/tabBar/tab-home.png'),
@@ -38,16 +5,16 @@ export const tabbar1 = [{
 		text: "首页"
 	},
 	{
-		pagePath: "/pages/category/category",
+		pagePath: "/pages/hall/halllist",
 		iconPath: require("@/static/tabBar/tab-cate.png"),
 		selectedIconPath: require("@/static/tabBar/tab-cate-current.png"),
-		text: "分类"
+		text: "参赛"
 	},
 	{
-		pagePath: "/pages/cart/cart",
+		pagePath: "/pages/order/order",
 		iconPath: require("@/static/tabBar/tab-pink.png"),
 		selectedIconPath: require("@/static/tabBar/tab-pink-current.png"),
-		text: "购物车"
+		text: "我的订单"
 	},
 	{
 		pagePath: "/pages/user/user",