wangmingchuan 11 months ago
parent 94b1d9da53
commit e37d21dc04
  1. 4
      config/dev.js
  2. 6
      config/index.js
  3. 2
      config/prod.js
  4. 15
      manifest.json
  5. 2
      pages/entrytype/index.vue
  6. 4
      pages/merchant/agent.vue
  7. 4
      pages/merchant/index.vue
  8. 4
      pages/special/gift_special.vue
  9. 2
      uni.scss
  10. 10
      vue.config.js

@ -3,6 +3,8 @@ export default {
HTTP_REQUEST_URL: "",
// #endif
// #ifndef H5
HTTP_REQUEST_URL: "https://demo.zhishi.tczxkj.com",
// HTTP_REQUEST_URL: "https://demo.zhishi.tczxkj.com",
HTTP_REQUEST_URL: "https://system.menghangjiaoyu.cn",
// #endif
}

@ -4,9 +4,9 @@ import prod from "@/config/prod";
const isDev = process.env.NODE_ENV === "development";
const baseConfig = {
BASE_LIVE_URL: "https://demo.zhishi.tczxkj.com",
IMAGE_ASSETS_URL: "https://demo.zhishi.tczxkj.com",
Url_SCHEMES: "demo.zhishi.tczxkj.com",
BASE_LIVE_URL: "https://system.menghangjiaoyu.cn",
IMAGE_ASSETS_URL: "https://system.menghangjiaoyu.cn",
Url_SCHEMES: "system.menghangjiaoyu.cn",
...(isDev ? dev : prod)
};
// 缓存时间 0 永久

@ -1,3 +1,3 @@
export default {
HTTP_REQUEST_URL: "https://demo.zhishi.tczxkj.com"
HTTP_REQUEST_URL: "https://system.menghangjiaoyu.cn"
}

@ -1,7 +1,7 @@
{
"name" : "一合知道",
"appid" : "__UNI__14E7652",
"description" : "",
"name" : "梦航教育宝",
"appid" : "__UNI__AB67F73",
"description" : "1.1",
"versionName" : "1.0.1",
"versionCode" : 101,
"transformPx" : false,
@ -120,9 +120,10 @@
"appid" : "wx34920eb219864734",
"setting" : {
"urlCheck" : false,
"minified" : false
"minified" : true
},
"usingComponents" : true
"usingComponents" : true,
"libVersion" : "latest"
},
"mp-alipay" : {
"usingComponents" : true
@ -147,10 +148,12 @@
"base" : "./"
},
"template" : "",
"title" : "一合知道"
"title" : "梦航教育学习宝"
},
"vueVersion" : "2",
"mp-kuaishou" : {
"appid" : "ks693554343641298814"
}
}
/* */

@ -1,7 +1,7 @@
<template>
<BaseContainer class="entry-details">
<NavBar title="入驻" />
<view class="title">欢迎入驻一合知道课堂</view>
<view class="title">欢迎入驻梦航教育学习宝课堂</view>
<view class="text">请根据您的实际需求选择入驻类型<span>成功入驻后无法修改请认真选择</span></view>
<!-- 个人入驻 -->
<view class="li" @click="goPage('/pages/merchant/index')">

@ -467,7 +467,7 @@ export default {
var type = 5;
// #endif
// #ifdef APP-PLUS
var url = `https://demo.zhishi.tczxkj.com/wap/merchant/apply_verify?uid=${this.uid}&cert_name=${this.formData.merchant_name}&cert_no=${this.formData.card_id}&type=1`
var url = `https://system.menghangjiaoyu.cn/wap/merchant/apply_verify?uid=${this.uid}&cert_name=${this.formData.merchant_name}&cert_no=${this.formData.card_id}&type=1`
let platform = uni.getSystemInfoSync().platform;
if (platform == "android") {
plus.runtime.openURL(url)
@ -476,7 +476,7 @@ export default {
}
// #endif
// #ifdef H5
var url = `https://demo.zhishi.tczxkj.com/wap/merchant/apply_verify?uid=${this.uid}&cert_name=${this.formData.merchant_name}&cert_no=${this.formData.card_id}&type=4`
var url = `https://system.menghangjiaoyu.cn/wap/merchant/apply_verify?uid=${this.uid}&cert_name=${this.formData.merchant_name}&cert_no=${this.formData.card_id}&type=4`
window.location.href = url
// #endif
// #ifdef MP-KUAISHOU

@ -410,7 +410,7 @@ export default {
var type = 5;
// #endif
// #ifdef APP-PLUS
var url = `https://demo.zhishi.tczxkj.com/wap/merchant/apply_verify?uid=${this.uid}&cert_name=${this.formData.merchant_name}&cert_no=${this.formData.card_id}&type=1`
var url = `https://system.menghangjiaoyu.cn/wap/merchant/apply_verify?uid=${this.uid}&cert_name=${this.formData.merchant_name}&cert_no=${this.formData.card_id}&type=1`
let platform = uni.getSystemInfoSync().platform;
if(platform == "android"){
plus.runtime.openURL(url)
@ -419,7 +419,7 @@ export default {
}
// #endif
// #ifdef H5
var url = `https://demo.zhishi.tczxkj.com/wap/merchant/apply_verify?uid=${this.uid}&cert_name=${this.formData.merchant_name}&cert_no=${this.formData.card_id}&type=4`
var url = `https://system.menghangjiaoyu.cn/wap/merchant/apply_verify?uid=${this.uid}&cert_name=${this.formData.merchant_name}&cert_no=${this.formData.card_id}&type=4`
window.location.href = url
// #endif
// #ifdef MP-KUAISHOU

@ -187,8 +187,8 @@ export default {
<style>
page {
background: url("https://demo.zhishi.tczxkj.com/wap/first/zsff/images/apply-lecturer1.jpg") center 99rpx/478rpx 76rpx no-repeat,
url("https://demo.zhishi.tczxkj.com/wap/first/zsff/images/apply-lecturer1.jpg") center/cover no-repeat;
background: url("https://system.menghangjiaoyu.cn/wap/first/zsff/images/apply-lecturer1.jpg") center 99rpx/478rpx 76rpx no-repeat,
url("https://system.menghangjiaoyu.cn/wap/first/zsff/images/apply-lecturer1.jpg") center/cover no-repeat;
}
</style>
<style scoped lang="scss">

@ -77,7 +77,7 @@ $uni-font-size-paragraph: 15px;
// 资源域名路径
$base-url: "https://demo.zhishi.tczxkj.com";
$base-url: "https://system.menghangjiaoyu.cn";
@function getAssetsPath($path) {
@return $base-url + $path;

@ -2,23 +2,23 @@ module.exports = {
devServer: {
proxy: {
'/wap': {
target: "https://demo.zhishi.tczxkj.com",
target: "https://system.menghangjiaoyu.cn",
changeOrigin: true
},
'/admin': {
target: "https://demo.zhishi.tczxkj.com",
target: "https://system.menghangjiaoyu.cn",
changeOrigin: true
},
'/system': {
target: "https://demo.zhishi.tczxkj.com",
target: "https://system.menghangjiaoyu.cn",
changeOrigin: true
},
'/static/js': {
target: "https://demo.zhishi.tczxkj.com",
target: "https://system.menghangjiaoyu.cn",
changeOrigin: true
},
'/wss': {
target: "https://demo.zhishi.tczxkj.com",
target: "https://system.menghangjiaoyu.cn",
changeOrigin: true,
ws: true
}

Loading…
Cancel
Save