中山小程序更换logo

common/request.js

@@ -5,24 +5,24 @@ import method from '@/common/methodTool.js'
 import api from './api.js'
 var num = 1
 //接口api   
-// export const BASE_URL = 'https://api.xyyxt.net'   //release
+export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
+// export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test(后端本地)
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
 // export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
 // export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
 
  //图片上传api
-// export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
-export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
+export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
+// export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 // web_view的
 // export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release-祥粤云学堂
 // export const WEBVIEW_URL = 'https://cm.xyyxt.net/'  //release-祥粤学堂
-// export const WEBVIEW_URL = 'https://zstcm.xyyxt.net/'  //release-中建云学堂
+export const WEBVIEW_URL = 'https://zstcm.xyyxt.net/'  //release-中建云学堂
 // export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
-export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境-祥粤云学堂
+// export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境-祥粤云学堂
 // export const WEBVIEW_URL = 'http://120.79.166.78:18011/' // 测试环境-祥粤学堂  
 // export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布(弃用了)
 
@@ -37,8 +37,8 @@ RVQplIVs5z3MxcUa9ptKPHUTgh8xMCBvl8sUJKwkmn4vYWeDfHT22EL7Hr1pTMwU
 hF6WiNlWfQTVoF1rhwIDAQAB
 -----END PUBLIC KEY-----`;
 
-export const version = '1.0.7' 
-export const tenantId = '867735392558919680'  // 祥粤云学堂：867735392558919680，祥粤学堂：667735392758919630, 中建云学堂-567735392758918520
+export const version = '1.0.1' 
+export const tenantId = '567735392758918520'  // 祥粤云学堂：867735392558919680，祥粤学堂：667735392758919630, 中建云学堂-567735392758918520
 export const myRequest = (options) => {
 	if (store.state.allowLoading && !options.noLoading) {
 		uni.showLoading({

manifest.json

@@ -73,9 +73,9 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 祥粤云学堂：wxd3c8ae80cf43a305, 祥粤学堂-wx871153afc95f55f4,中建云学堂-wx47d33eb64f9f2a0d*/
+    /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxd3c8ae80cf43a305",
+        "appid" : "wx47d33eb64f9f2a0d", // 祥粤云学堂：wxd3c8ae80cf43a305, 祥粤学堂-wx871153afc95f55f4
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

pages/course/index.vue

@@ -2,7 +2,8 @@
 	<view >
 		<u-navbar :is-back="false" title="选课中心" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
 			<view class="slot-wrap">
-				<image  src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-if="tenantId == '567735392758918520'" src="/static/zhongshan_logo.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-else src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
 			</view>
 		</u-navbar>
 		<view v-show="!show">
@@ -179,11 +180,13 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import { tenantId } from '@/common/request.js';
 export default {
 	components: {
 	},
 	data() {
 		return {
+			tenantId: tenantId,
 			show:false,
 			courseLists:[
 				{

pages/index/index.vue

@@ -2,7 +2,8 @@
 	<view class="index">
 		<u-navbar class="navbar" :is-back="false" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
 			<view class="slot-wrap">
-				<image  src="/static/logo2.png"></image>
+				<image v-if="tenantId == '567735392758918520'" src="/static/zhongshan_logo.png"></image>
+				<image v-else src="/static/logo2.png"></image>
 			</view>
 		</u-navbar>
 		<view class="swiper">
@@ -226,10 +227,11 @@
 
 <script>
 import { mapGetters, mapActions } from 'vuex';
-import { socket_url, version} from '@/common/request.js';
+import { socket_url, version, tenantId} from '@/common/request.js';
 export default {
 	data() {
 		return {
+			tenantId: tenantId,
 			tabNum: 0,
 			infoNums:0,
 			list:[],

pages/learn/index.vue

@@ -2,7 +2,8 @@
     <view class="learnings">
 		<u-navbar :is-back="false" title="学习中心" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
 			<view class="slot-wrap">
-				<image  src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-if="tenantId == '567735392758918520'" src="/static/zhongshan_logo.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-else src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
 			</view>
 		</u-navbar>
 		<u-line color="#D6D6DB" />
@@ -395,10 +396,11 @@
 <script>
 var curTime = new Date().getTime() // 当前时间的时间戳
 import {mapGetters,mapActions} from 'vuex'
-import { WEBVIEW_URL } from '@/common/request.js'
+import { WEBVIEW_URL, tenantId } from '@/common/request.js'
 export default {
     data() {
         return {
+			tenantId: tenantId,
 			leftDays: 0,
 			paramC: {
 				pageNum: 1,

pages/questionBank/index.vue

@@ -2,7 +2,8 @@
     <view class="questionBank">
         <u-navbar :is-back="false" title="题库中心" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
 			<view class="slot-wrap">
-				<image  src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-if="tenantId == '567735392758918520'" src="/static/zhongshan_logo.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-else src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
 			</view>
 		</u-navbar>
 		<!-- 有学习的课程 -->
@@ -91,9 +92,11 @@
 
 <script>
 import { mapGetters } from 'vuex'
+import { tenantId } from '@/common/request.js';
 export default {
 	data() {
 		return {
+			tenantId: tenantId,
 			allLoading: false, // 加载样式
 			questionLists: [], // 题库列表
 			param: {

pages/wd/index.vue

@@ -3,7 +3,8 @@
 		<!-- <image mode="widthFix" :src="isLogin ? '/static/wd_bg_login.jpg' : '/static/wd_bg.jpg'" :class="isLogin ? 'login_full_img' : 'full_img'"></image> -->
 		<u-navbar :is-back="false" title="我的" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
 			<view class="slot-wrap">
-				<image src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-if="tenantId == '567735392758918520'" src="/static/zhongshan_logo.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-else src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
 			</view>
 		</u-navbar>
 		<view v-if="isLogin" class="imgs_bg">
@@ -141,9 +142,11 @@
 <script>
 // import { websocket } from '@/common/socket.js';
 import { mapGetters } from 'vuex';
+import { tenantId } from '@/common/request.js';
 export default {
 	data() {
 		return {
+			tenantId: tenantId,
 			list: [23, 24, 25, 26, 27, 28, 29],
 			content: '此功能暂未开放',
 			show: false,

pages4/login/pcLogin.vue

@@ -1,9 +1,6 @@
 <template>
     <view class="pcLogins">
         <u-navbar :is-back="false" title="登录" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
-            <view class="slot-wrap">
-                <image src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
-            </view>
         </u-navbar>
         <u-line color="#D6D6DB" />
         <view class="contents">

pages4/login/pcLoginSuccess.vue

@@ -1,9 +1,6 @@
 <template>
     <view class="pcLogins" :class="{bgcolor: !hidden}">
         <u-navbar :is-back="false" title="登录成功" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
-            <view class="slot-wrap">
-                <image src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
-            </view>
         </u-navbar>
         <u-line color="#D6D6DB" />
         <view class="contents">

pages4/shopping/shoppingCart.vue

@@ -1,7 +1,10 @@
 <template>
 	<view>
 		<u-navbar :is-back="false" title="购物车" :border-bottom="false" title-color="#333333" back-icon-color="#ffffff">
-			<view class="slot-wrap"><image src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image></view>
+			<view class="slot-wrap">
+				<image v-if="tenantId == '567735392758918520'" src="/static/zhongshan_logo.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				<image v-else src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+			</view>
 		</u-navbar>
 		<view v-show="isLogin">
 			<view v-if="!list.length"><u-empty text="购物车为空" margin-top="500" mode="car"></u-empty></view>
@@ -161,9 +164,11 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import { tenantId } from '@/common/request.js';
 export default {
 	data() {
 		return {
+			tenantId: tenantId,
 			gradeValue: -1,
 			isLogin: false,
 			allChecked: false,