Commit a8b467a5 by linjinhong

添加coutryCode字段

parent f89489d4
...@@ -845,6 +845,12 @@ export default { ...@@ -845,6 +845,12 @@ export default {
</el-button> </el-button>
</div> </div>
<div class="right-user"> <div class="right-user">
<div
v-if="user && user.factory"
style="font-weight: 700;margin-left: 8px;"
>
{{ user.factory.countryCode || "CN" }}
</div>
<p v-if="user && user.factory">{{ user.factory.title }}</p> <p v-if="user && user.factory">{{ user.factory.title }}</p>
<el-dropdown @command="dropdownCommand"> <el-dropdown @command="dropdownCommand">
<div style="margin-right: 20px"> <div style="margin-right: 20px">
......
...@@ -14,6 +14,10 @@ export default { ...@@ -14,6 +14,10 @@ export default {
}, },
mounted() { mounted() {
this.user = this.$dataStore.get("user"); this.user = this.$dataStore.get("user");
if (this.user.factory && this.user.factory.countryCode) {
this.factoryType = this.user.factory.countryCode;
}
console.log(17, this.user);
this.$refs.updateDialog.checkUpdate().then((data) => { this.$refs.updateDialog.checkUpdate().then((data) => {
console.log(17, data); console.log(17, data);
......
...@@ -1113,12 +1113,11 @@ export default { ...@@ -1113,12 +1113,11 @@ export default {
v-for="(img, i) in selectImgList" v-for="(img, i) in selectImgList"
:key="i" :key="i"
class="img-item showImg" class="img-item showImg"
style="max-width: 50%;"
@click.stop.prevent="selectImg(img, i)" @click.stop.prevent="selectImg(img, i)"
> >
<img <img
:key="i" :key="i"
style="width: auto;height: 190px;" style="width: auto;height: 190px;max-width: 200px;"
:src="img.productionFile" :src="img.productionFile"
/> />
<!-- <span>{{ img.designId }}</span> --> <!-- <span>{{ img.designId }}</span> -->
......
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