Merge branch 'cyl/master-im'

pages/login/index.vue

@@ -3,7 +3,7 @@
 		<!-- 15936360682 -->
 		<view class="g_h_70"></view>
 		<view class="g_flex_row_center g_mb_10">
-			<img :src="localBaseImg + 'boss.png'" alt="" class="g_w_56 g_h_56 g_radius_8" />
+			<img :src="v3BaseImg + 'boss.png'" alt="" class="g_w_56 g_h_56 g_radius_8" />
 		</view>
 		<view style="font-size: 18px; font-weight: 400; color: #919191; line-height: 25px; margin-bottom: 60px; text-align: center">劳务上下游收发单工具</view>
 		<view class="m-form g_mb_50 g_pl_40 g_pr_40">
@@ -56,6 +56,7 @@ export default {
 	data() {
 		return {
 			localBaseImg: this.G.store().localBaseImg,
+			v3BaseImg:this.G.store().v3BaseImg,
 			isLoginCode: true,
 			form: {
 				tel: "",

root/bind/myMain.vue

@@ -18,7 +18,7 @@
 		></canvas>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
-		<view class="canvas-card g_position_rela" id="canvas-card" style="background-image: url('/static/image/bg.png')">
+		<view class="canvas-card g_position_rela" id="canvas-card" style="background-image: url('https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/bg.png')">
 			<view class="m-card g_position_abso" style="left: 50%; transform: translateX(-50%)">
 				<view class="g_w_all g_h_all g_position_rela">
 					<view class="g_pl_20 g_pt_18 g_pr_24">

root/person/about.vue

@@ -2,7 +2,7 @@
 	<view class="p-person-about g_w_all g_h_all g_bg_f_5 g_flex_column_between g_kuaishou">
 		<view class="g_flex_1">
 			<view class="g_mb_24 g_flex_row_center" style="padding-top: 130px;">
-				<img :src="localBaseImg + 'boss.png'" class="g_w_63 g_h_63 g_radius_20">
+				<img :src="v3BaseImg + 'boss.png'" class="g_w_63 g_h_63 g_radius_20">
 			</view>
 			<view class="g_fs_24 g_c_3 g_flex_row_center g_mb_8 g_fw_600">报名助手</view>
 			<view class="g_fs_16 g_c_3 g_flex_row_center">Version {{version}}</view>
@@ -24,6 +24,7 @@
 		},
 		data(){
 			return {
+				v3BaseImg:this.G.store().v3BaseImg,
         year:new Date().getFullYear(),
 				localBaseImg:this.G.store().localBaseImg,
 				version:this.G.store().version

root/person/memberApplyQRCode.vue

@@ -16,7 +16,7 @@
 		></canvas>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
-		<view class="canvas-card g_position_rela" id="canvas-card" style="background-image: url('/static/image/bg.png')">
+		<view class="canvas-card g_position_rela" id="canvas-card" style="background-image: url('https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/bg.png')">
 			<view class="m-card g_position_abso" style="left: 50%; transform: translateX(-50%)">
 				<view class="g_w_all g_h_all g_position_rela">
 					<view class="g_pl_20 g_pt_18 g_pr_24">

utils/common.js

@@ -6,6 +6,7 @@ let data = {
       appid: 'wxa7b4864efbcff191', //
       localBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/", // app图片前缀
       cdnBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/", // cdn图片公共前缀路径
+			v3BaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3", // cdn图片公共前缀路径
       loginText: '请登录',
       // #ifdef MP-WEIXIN
       version: uni.getAccountInfoSync().miniProgram.version || "1.0.16",