Commit 6aac49e8 authored by leiqingsong's avatar leiqingsong

修改版本下载方式

parent 1c1ba10f
# 生产环境 部署生产环境放开这个 # 生产环境 部署生产环境放开这个
# VUE_APP_BASE_URL = "http://app.xitiansen.com" VUE_APP_BASE_URL = "http://app.xitiansen.com"
# 测试环境 部署测试环境放开这个 # 测试环境 部署测试环境放开这个
VUE_APP_BASE_URL = "http://8.131.244.76:81" # VUE_APP_BASE_URL = "http://8.131.244.76:81"
\ No newline at end of file \ No newline at end of file
...@@ -7,13 +7,13 @@ import "minirefresh/dist/debug/minirefresh.css"; ...@@ -7,13 +7,13 @@ import "minirefresh/dist/debug/minirefresh.css";
import "amfe-flexible"; import "amfe-flexible";
import "@/plugins/vant-ui.js"; import "@/plugins/vant-ui.js";
import "@/plugins/echarts-plugins.js"; import "@/plugins/echarts-plugins.js";
import Vconsole from "vconsole"; // import Vconsole from "vconsole";
import bridgeToAppFun from "@/utils/bridgeToAppFun"; import bridgeToAppFun from "@/utils/bridgeToAppFun";
Vue.prototype.$bridgeToAppFun = new bridgeToAppFun(); Vue.prototype.$bridgeToAppFun = new bridgeToAppFun();
/*生产环境请注释掉 */ /*生产环境请注释掉 */
Vue.prototype.$vConsole = new Vconsole(); // Vue.prototype.$vConsole = new Vconsole();
Vue.use(MiniRefreshTools); Vue.use(MiniRefreshTools);
Vue.config.productionTip = false; Vue.config.productionTip = false;
......
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
this.imgSrc = `${process.env.VUE_APP_BASE_URL}/shop-mall/api/user/registerByQrCode?height=150&userId=${userId}&width=150`; this.imgSrc = `${process.env.VUE_APP_BASE_URL}/shop-mall/api/user/registerByQrCode?height=150&userId=${userId}&width=150`;
this.btnTimer = setTimeout(() => { this.btnTimer = setTimeout(() => {
this.showBtn = true; this.showBtn = true;
}, 800); }, 1500);
}, },
getUserPhoto(res) { getUserPhoto(res) {
let uInt8Array = new Uint8Array(res); let uInt8Array = new Uint8Array(res);
......
<template> <template>
<div class="invitee"> <div class="invitee">
<div class="baseInfo"> <div class="baseInfo">
<img class="avatar" src="@/assets/images/avatar.png" alt="用户头像" /> <img class="avatar" :src="imageUrl + inviteeItem.headImage" alt="用户头像" />
<span class="userName">{{ inviteeItem.userId }}</span> <span class="userName">{{ inviteeItem.userId }}</span>
</div> </div>
<div class="detail"> <div class="detail">
...@@ -29,6 +29,11 @@ export default { ...@@ -29,6 +29,11 @@ export default {
type: Object, type: Object,
default: () => {} default: () => {}
} }
},
data() {
return {
imageUrl: process.env.VUE_APP_BASE_URL
}
} }
}; };
</script> </script>
......
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
</div> </div>
<div v-if="title == '注册失败'" class="tip">{{ tip }}</div> <div v-if="title == '注册失败'" class="tip">{{ tip }}</div>
<div v-else class="tip"> <div v-else class="tip">
<a :href="androidUrl">下载安卓版App</a> | <p>安卓版App: {{ androidUrl }}</p>
<a :href="iosUrl">下载IOS版App</a> <P>IOS版App: {{ iosUrl }} </P>
</div> </div>
<van-button @click="show = false">确定</van-button> <van-button @click="show = false">确定</van-button>
</div> </div>
...@@ -169,6 +169,11 @@ export default { ...@@ -169,6 +169,11 @@ export default {
console.log(res); console.log(res);
}); });
}, },
test() {
this.show = true;
this.title = "注册成功";
this.getDownUrl();
},
handleResister() { handleResister() {
// 校验文本框必填项 // 校验文本框必填项
const _this = this; const _this = this;
...@@ -278,7 +283,7 @@ export default { ...@@ -278,7 +283,7 @@ export default {
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -60%); transform: translate(-50%, -60%);
padding: 30px 0; padding: 20px 0;
text-align: center; text-align: center;
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 4px;
...@@ -291,7 +296,7 @@ export default { ...@@ -291,7 +296,7 @@ export default {
color: #333333; color: #333333;
} }
.success-tip { .success-tip {
margin: 25px auto; margin: 10px auto;
img { img {
width: 72px; width: 72px;
height: 72px; height: 72px;
...@@ -340,8 +345,11 @@ export default { ...@@ -340,8 +345,11 @@ export default {
background-color: #88c678; background-color: #88c678;
border-radius: 18px; border-radius: 18px;
color: #ffffff; color: #ffffff;
margin-top: 25px; margin-top: 15px;
}
} }
p {
margin: 5px;
} }
} }
} }
......
...@@ -101,11 +101,12 @@ export default { ...@@ -101,11 +101,12 @@ export default {
}, },
methods: { methods: {
onUpdateVersion() { onUpdateVersion() {
if (this.needUpdate) { // if (this.needUpdate) {
location.href = this.downAppUrl; // location.href = this.downAppUrl;
} else { // } else {
// this.versionShow = false;
// }
this.versionShow = false; this.versionShow = false;
}
}, },
updateVersion() { updateVersion() {
const params = { const params = {
...@@ -120,7 +121,7 @@ export default { ...@@ -120,7 +121,7 @@ export default {
} else if (res.code == 0) { } else if (res.code == 0) {
this.downAppUrl = res.data; this.downAppUrl = res.data;
this.updateResult = "最新版App下载地址:" + res.data; this.updateResult = "最新版App下载地址:" + res.data;
this.updateBtn = "下载最新版App"; // this.updateBtn = "下载最新版App";
this.needUpdate = true; this.needUpdate = true;
} }
}); });
......
...@@ -4,7 +4,7 @@ const name = "西田森App"; ...@@ -4,7 +4,7 @@ const name = "西田森App";
module.exports = { module.exports = {
publicPath: "/front", publicPath: "/front",
// outputDir: "front", outputDir: "front",
devServer: { devServer: {
proxy: { proxy: {
'/shop-mall': { '/shop-mall': {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment