合并代码

jiuyi2/api/durian.js

@@ -42,7 +42,7 @@ export const durian = {
 	 */
 	exchange(param) {
 		return util.request({
-			url: `/app/durian/exchange`,
+			url: `/coreplay/duriantreeinfo/exchange`,
 			method: 'POST',
 			data: param.data,
 			load: true,

jiuyi2/common/js/util.js

@@ -100,7 +100,7 @@ const util = {
 			// 请求头
 			obj.header = {
 				// 'Content-Type': 'multipart/form-data; ',
-				'Content-Type': 'application/json;charset=UTF-8',
+				'Content-Type': 'multipart/form-data',
 				'Access-Control-Allow-Origin': '*',
 				...obj.header,
 			}

jiuyi2/pages/index/orchard.vue

@@ -84,7 +84,7 @@
 			durianlApi.exchange({
 				data: {
 					// userId: userinfo.value.userId,
-					DurianConfigId: selectItem.value.id,
+					durianConfigId: selectItem.value.durianConfigInfoId,
 					type: type
 				},
 			}).then(rs => {
@@ -220,17 +220,17 @@
 		}
 
 		.item:nth-child(9n-7) {
-			background-color: #FBC5C5;
-		}
-
-		.item:nth-child(9n-6) {
 			background-color: #FFF0B1;
 		}
 
-		.item:nth-child(9n-5) {
+		.item:nth-child(9n-6) {
 			background-color: #CAF0F3;
 		}
 
+		.item:nth-child(9n-5) {
+			background-color: #FBC5C5;
+		}
+
 		.item:nth-child(9n-4) {
 			background-color: #C3EBBD;
 		}

jiuyi2/pages/index/wallet/wallet.vue

@@ -93,7 +93,7 @@
 <template>
 	<view class="app plr60">
 		<!-- 我的钱包 -->
-		<view class="board mt60 ptb25 plr30 cfff f28 br25">
+		<view class="board mt60 ptb25 plr30 c111 f28 br25">
 			<view class="">总资产(余额)</view>
 
 			<view class="balance rows">
@@ -102,14 +102,12 @@
 				</view>
 
 				<view class="">
-					<view>
+					<navigator url="/pages/index/wallet/topUp" hover-class="none">
-						<navigator url="/pages/index/wallet/topUp" hover-class="none" class="btn sm bar black plr20">充值
+						<view class="btn sm bar black plr20">充值</view>
-						</navigator>
+					</navigator>
-					</view>
+					<navigator url="/pages/index/wallet/get" hover-class="none">
-					<view class="mt20">
+						<view class="btn sm bar black mt20 plr20">提现</view>
-						<navigator url="/pages/index/wallet/get" hover-class="none" class="btn sm bar black plr20">提现
+					</navigator>
-						</navigator>
-					</view>
 				</view>
 			</view>
 
@@ -160,7 +158,7 @@
 <style lang="scss" scoped>
 	// 板子
 	.board {
-		background-image: linear-gradient(116deg, #27EFE2 0%, #6D00FF 48%, #FF004F 100%);
+		background-image: linear-gradient(130deg, rgb(233, 170, 80) 0%, rgb(249, 217, 89) 50%, rgb(233, 170, 80) 100%);
 	}
 
 	// 待释放弹窗

jiuyi2/vite.config.js

@@ -6,7 +6,7 @@ import uni from '@dcloudio/vite-plugin-uni';
 export default defineConfig({
 	plugins: [uni()],
 	server: {
-		host: "localhost",
+		host: "0.0.0.0",
 		port: 5173,
 		proxy: {
 			"/shopify": {
@@ -14,15 +14,15 @@ export default defineConfig({
 				changeOrigin: true,
 			},
 			"/user": {
-				target: "http://192.168.1.236:8080",
+				target: "http://192.168.1.241:8080",
 				changeOrigin: true,
 			},
 			"/coreplay": {
-				target: "http://192.168.1.241:9400",
+				target: "http://192.168.1.241:8080",
 				changeOrigin: true,
 			},
 			"/file": {
-				target: "http://192.168.1.241:8080",
+				target: "http://192.168.1.236:8080",
 				changeOrigin: true,
 			},
 		}