From 753a2628806df6d5ac0d1768cb6f605e3ecf2eb4 Mon Sep 17 00:00:00 2001
From: xiaoshan <xiaoshan@lianxianke.cn>
Date: Mon, 8 Jan 2024 14:23:10 +0800
Subject: [PATCH] oss

---
 config.js            |  5 ++++-
 main.js              |  2 ++
 manifest.json        |  2 +-
 pages/mine/index.vue | 49 ++++++++++++++++++++++----------------------
 project.config.json  |  8 ++++++++
 utils/util.js        |  8 ++++++++
 6 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/config.js b/config.js
index 97e9903..4020537 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,9 @@
 // 应用全局配置
+
 module.exports = {
 	//正式
+	// baseUrl: 'https://mall.lianxianke.cn/car_app_api',
+	// 测试
 	baseUrl: 'https://mall.lianxianke.cn/car_app_api',
 	// baseUrl: 'https://mall.lianxianke.cn/car_app_api',
 	TOKENNAME: 'Authori-zation',
@@ -10,7 +13,7 @@ module.exports = {
 	fileUploadUrl: 'https://mall.lianxianke.cn/car_app_api/api/front/upload/image',
 	WebSocketUrl: 'ws://121.199.24.205:9107/lxk/websocket',
 	WebSocketOpen: false,
-	aliyunOssUrl: "https://jimte.oss-cn-hangzhou.aliyuncs.com",
+	aliyunOssUrl: "https://qicheoss.oss-cn-shanghai.aliyuncs.com",
 	OSSAccessKeyId: "LTAI5tFZzfAMHw3WJNQtrhBZ",
 	OssAccesskeySercet: "rqZUht8RhrAfxDltWeGs1Yzpqzmu8W",
 	OssDir: "ossimg/",
diff --git a/main.js b/main.js
index c518b1d..cd56d2e 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,7 @@ import App from './App'
 import store from './store' // store
 import plugins from './plugins' // plugins
 import util from 'utils/util'
+import config from 'config'
 import './permission' // permission
 import uView from '@/uni_modules/uview-ui'
 import ZPMixin from '@/uni_modules/z-paging/components/z-paging/js/z-paging-mixin'
@@ -17,6 +18,7 @@ Vue.use(plugins)
 
 Vue.config.productionTip = false
 Vue.prototype.$util = util;
+Vue.prototype.$config = config;
 Vue.prototype.$store = store
 Vue.prototype.$toast = toast
 Vue.prototype.$confirm = showConfirm
diff --git a/manifest.json b/manifest.json
index b395c4d..8c7f1ce 100644
--- a/manifest.json
+++ b/manifest.json
@@ -46,7 +46,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx67c3ee9398603438",
+        "appid" : "wx0be41c65a0f132eb",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 276a2bb..0ce638e 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -3,13 +3,12 @@
 		<view class="user-info flex align-center justify-between">
 			<view class="user-left flex-column justify-center">
 				<view class="image-box rel flex align-center justify-center">
-					<!-- #ifndef MP -->
 					<image v-if="avatar" class="avatar" src="@/static/images/app/mine/avatar.png" mode=""></image>
-					<image v-else class="avatar" src="@/static/images/app/mine/avatar.png" mode=""></image>
-					<image class="medal abs" src="@/static/images/app/mine/medal.png" mode=""></image>
+					<!-- #ifdef MP-WEIXIN -->
+					<image v-else class="avatar" :src="`${config.aliyunOssUrl}/static/images/app/mine/avatar.png`" mode=""></image>
+					<image class="medal abs" :src="`${config.aliyunOssUrl}/static/images/app/mine/medal.png`" mode=""></image>
 					<!-- #endif -->
-					<!-- #ifdef MP -->
-					<image v-if="avatar" class="avatar" src="@/static/images/app/mine/avatar.png" mode=""></image>
+					<!-- #ifdef APP -->
 					<image v-else class="avatar" src="@/static/images/app/mine/avatar.png" mode=""></image>
 					<image class="medal abs" src="@/static/images/app/mine/medal.png" mode=""></image>
 					<!-- #endif -->
@@ -20,21 +19,22 @@
 			</view>
 			<view class="user-right rel">
 				<view class="setting abs">
-					<!-- #ifndef MP -->
-					<image src="@/static/images/app/mine/setting.png" mode=""></image>
+					<!-- #ifdef MP-WEIXIN -->
+					<image :src="`${config.aliyunOssUrl}/static/images/app/mine/setting.png`" mode=""></image>
 					<!-- #endif -->
-					<!-- #ifdef MP -->
+					<!-- #ifdef APP -->
 					<image src="@/static/images/app/mine/setting.png" mode=""></image>
 					<!-- #endif -->
 				</view>
 				<view class="sign-btn abs">
-					<!-- #ifndef MP -->
-					<image v-if="isSign" class="sign-btn-1" src="@/static/images/app/mine/sign.png" mode=""></image>
+					<!-- #ifdef MP-WEIXIN -->
+					<image v-if="isSign" class="sign-btn-1" :src="`${config.aliyunOssUrl}/static/images/app/mine/sign.png`" mode=""></image>
+					<image @click="checkedSign" v-else class="sign-btn-2" :src="`${config.aliyunOssUrl}/static/images/app/mine/sign_btn.png`" mode=""></image>
 					<!-- #endif -->
-					<!-- #ifdef MP -->
+					<!-- #ifdef APP -->
 					<image v-if="isSign" class="sign-btn-1" src="@/static/images/app/mine/sign.png" mode=""></image>
-					<!-- #endif -->
 					<image @click="checkedSign" v-else class="sign-btn-2" src="@/static/images/app/mine/sign_btn.png" mode=""></image>
+					<!-- #endif -->
 				</view>
 			</view>
 		</view>
@@ -79,10 +79,10 @@
 					<view class="num white f-22" v-if="!index">
 						32
 					</view>
-					<!-- #ifndef MP -->
-					<image src="@/static/images/app/icon/arrow-right.png" mode=""></image>
+					<!-- #ifdef MP-WEIXIN -->
+					<image :src="`${config.aliyunOssUrl}/static/images/app/icon/arrow-right.png`" mode=""></image>
 					<!-- #endif -->
-					<!-- #ifdef MP -->
+					<!-- #ifdef APP -->
 					<image src="@/static/images/app/icon/arrow-right.png" mode=""></image>
 					<!-- #endif -->
 				</view>
@@ -103,14 +103,15 @@
 
 <script>
   import { mineMenu } from '@/data/menu';
-  
+	import config from '@/config';
   export default {
     data() {
       return {
 				signShow: false,
 				isSign: false,
 				avatar: '',
-				mineMenu
+				mineMenu,
+				config
       }
     },
     computed: {
@@ -119,7 +120,7 @@
       }
     },
 		onShow() {
-			
+			console.log(this.$config.aliyunOssUrl);
 		},
     methods: {
 			checkedSign() {
@@ -148,11 +149,11 @@
 		.user-info {
 			width: 750rpx;
 			height: 524rpx;
-			// #ifndef MP
-			background-image: url('../../static/images/app/mine/mine-bg.png');
+			// #ifdef APP
+			background-image: url('@/static/images/app/mine/mine-bg.png');
 			// #endif
-			// #ifdef MP
-			background-image: url('../../static/images/app/mine/mine-bg.png');
+			// #ifdef MP-WEIXIN
+			background-image: url('https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/app/mine/mine-bg.png');
 			// #endif
 			background-repeat: no-repeat;
 			background-size: contain;
@@ -184,10 +185,10 @@
 			.user-right {
 				height: 524rpx;
 				.setting {
-					// #ifndef MP
+					// #ifdef APP
 					top: 124rpx;
 					// #endif
-					// #ifdef MP
+					// #ifdef MP-WEIXIN
 					top: 164rpx;
 					// #endif
 					right: 24rpx;
diff --git a/project.config.json b/project.config.json
index e69de29..574187e 100644
--- a/project.config.json
+++ b/project.config.json
@@ -0,0 +1,8 @@
+"packOptions": {
+  "ignore": [
+     {
+       "type": "folder",
+       "value": "static/images/app"
+     }
+   ]
+ }
diff --git a/utils/util.js b/utils/util.js
index d477364..6c1a7d1 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -3,6 +3,14 @@ import { TOKENNAME, baseUrl, imgPath } from '../config.js';
 import { ossUpload } from '@/js_sdk/AliOSS/oss.js'
 import { getToken } from './auth.js';
 export default {
+	newImg: function(pahg) {
+		// #ifdef MP-WEIXIN
+		return 'https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/images/app/' + pahg
+		// #endif
+		// #ifndef MP-WEIXIN
+		return '@/static/images/app/' + pahg
+		// #endif
+	},
 	/**
 	 * opt  object | string
 	 * to_url object | string