Skip to content

O
offical_web
Commit 52549bbe by zhuzhequan
Options

Merge branch 'dev' into 'master' 

重新绑定功能样式修改

See merge request !17
parents 75abb357 7c4ec3fe
Showing with 64 additions and 31 deletions
src/components/headerNavMobile.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<a class="nav-icon icon-menu" href="javascript:;" @click="toggleShow"></a> <a class="nav-icon icon-menu" href="javascript:;" @click="toggleShow"></a>
</div> </div>
<div class="header-nav-mobile_logo"> <div class="header-nav-mobile_logo">
<img src="../assets/logo.png" height="40px" /> <img src="../assets/logo.png" style="height: 40px" />
</div> </div>
<div class="header-nav-mobile_login" v-if="!userInfo"> <div class="header-nav-mobile_login" v-if="!userInfo">
<span @click="login">登录</span> <span @click="login">登录</span>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div v-show="showing" class="header-nav-mobile-overlay"> <div v-show="showing" class="header-nav-mobile-overlay">
<div <div
class="header-nav-mobile-header flex items-center justify-between p-2.5"> class="header-nav-mobile-header flex items-center justify-between p-2.5">
<img src="../assets/logo.png" class="w-32" height="40px" /> <img src="../assets/logo.png" class="w-32" style="height: 40px" />
<i <i
class="el-icon-close text-xl font-bold cursor-pointer" class="el-icon-close text-xl font-bold cursor-pointer"
@click="toggleShow"></i> @click="toggleShow"></i>
......
src/views/contact.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="login_bg"> <div class="login_bg">
<div class="contact-header"> <div class="contact-header">
<div class="header-image"> <div class="header-image">
<img src="../assets/logo.png" height="40px" /> <img src="../assets/logo.png" style="height: 40px" />
</div> </div>
<div class="user-info"> <div class="user-info">
<!-- <div class="user-msg"> <!-- <div class="user-msg">
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</div> </div>
<div class="login_content"> <div class="login_content">
<div class="no-authority"> <div class="no-authority">
<div style="display: flex;align-items: center"> <div style="display: flex; align-items: flex-end">
<div <div
style=" style="
text-align: center; text-align: center;
...@@ -44,7 +44,17 @@ ...@@ -44,7 +44,17 @@
v-else> v-else>
您尚未开通erp权限,请联系您的商务经理 您尚未开通erp权限,请联系您的商务经理
</h1> </h1>
<el-button @click="handleBind" style="margin-left: 8px;height: 41px" type="primary">重新绑定ERP</el-button> <!-- <b-->
<!-- @click="handleBind"-->
<!-- style="-->
<!-- cursor: pointer;-->
<!-- font-size: 26px;-->
<!-- color: blue;-->
<!-- margin-bottom: 24px;-->
<!-- margin-left: 10px;-->
<!-- ">-->
<!-- 重新绑定ERP-->
<!-- </b>-->
</div> </div>
<h2 <h2
style=" style="
...@@ -66,13 +76,13 @@ ...@@ -66,13 +76,13 @@
"> ">
邮箱:nina@jomalls.com 邮箱:nina@jomalls.com
</h2> </h2>
<div style="display:flex;justify-content: center">
<el-button <el-button
style=" style="
text-align: center; text-align: center;
font-size: 30px; font-size: 30px;
width: 160px; width: 160px;
height: 60px; height: 60px;
margin-left: 300px;
margin-top: 30px; margin-top: 30px;
border-radius: 15px; border-radius: 15px;
" "
...@@ -80,16 +90,39 @@ ...@@ -80,16 +90,39 @@
@click="goBack"> @click="goBack">
返回首页 返回首页
</el-button> </el-button>
<el-button
:style="{width:userInfo && userInfo.erpKey?'180':''}"
style="
text-align: center;
font-size: 30px;
width: 160px;
height: 60px;
margin-left: 40px;
margin-top: 30px;
border-radius: 15px;
"
type="primary"
@click="handleBind">
{{ userInfo && userInfo.erpKey ? '重新' : '' }}绑定ERP
</el-button>
</div> </div>
</div> </div>
<el-dialog :close-on-click-modal="false" :visible.sync="bindVisible" titlt="" width="500px"> </div>
<el-dialog
:close-on-click-modal="false"
:visible.sync="bindVisible"
titlt=""
width="500px">
<template slot="title">重新绑定ERP</template> <template slot="title">重新绑定ERP</template>
<el-form ref="formRef" :model="bindForm" inline label-width="80px"> <el-form ref="formRef" :model="bindForm" inline label-width="80px">
<el-form-item label="域名" prop="erpKey" :rules="[{ required: true, message: '请输入erp域名',trigger:'blur' }]"> <el-form-item
<el-input style="width: 100%;" v-model="bindForm.erpKey" clearable> label="域名"
<template slot="append"> prop="erpKey"
.jomalls.com :rules="[
</template> { required: true, message: '请输入erp域名', trigger: 'blur' },
]">
<el-input style="width: 100%" v-model="bindForm.erpKey" clearable>
<template slot="append">.jomalls.com</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -111,52 +144,52 @@ export default { ...@@ -111,52 +144,52 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
bindVisible:false, bindVisible: false,
bindForm:{ bindForm: {
erpKey:'' erpKey: '',
}, },
userInfo: JSON.parse(localStorage.getItem('userInfo')), userInfo: JSON.parse(localStorage.getItem('userInfo')),
shopifyObj: JSON.parse(localStorage.getItem('shopifyObj')) shopifyObj: JSON.parse(localStorage.getItem('shopifyObj')),
} }
}, },
computed: { computed: {
// ...mapState(['shopifyObj']), // ...mapState(['shopifyObj']),
}, },
mounted() { mounted() {
console.log(this.shopifyObj); console.log(this.shopifyObj)
if (this.userInfo && this.shopifyObj) { if (this.userInfo && this.shopifyObj) {
this.getShopifyInfo() this.getShopifyInfo()
} }
}, },
methods: { methods: {
...mapMutations(['setUserInfo']), ...mapMutations(['setUserInfo']),
confirmBind(){ confirmBind() {
this.$refs.formRef.validate((v)=>{ this.$refs.formRef.validate((v) => {
if(v){ if (v) {
let u = localStorage.getItem('userInfo') let u = localStorage.getItem('userInfo')
if(u) u = JSON.parse(u) if (u) u = JSON.parse(u)
let obj = { let obj = {
erpKey: this.bindForm.erpKey, erpKey: this.bindForm.erpKey,
} }
if(u.email) obj.email = u.email if (u.email) obj.email = u.email
if(u.phoneNumber) obj.phoneNumber = u.phoneNumber if (u.phoneNumber) obj.phoneNumber = u.phoneNumber
post('business/user/bindErp',obj).then((res) => { post('business/user/bindErp', obj).then((res) => {
if(res.code === 200){ if (res.code === 200) {
this.$message.success('操作成功') this.$message.success('操作成功')
u.erpKey = this.bindForm.erpKey u.erpKey = this.bindForm.erpKey
localStorage.setItem('userInfo',JSON.stringify(u)) localStorage.setItem('userInfo', JSON.stringify(u))
location.reload() location.reload()
} }
}) })
} }
}) })
}, },
handleBind(){ handleBind() {
this.bindVisible = true this.bindVisible = true
this.bindForm = { this.bindForm = {
erpKey: '' erpKey: '',
} }
this.$nextTick(function(){ this.$nextTick(function () {
this.$refs.formRef?.clearValidate() this.$refs.formRef?.clearValidate()
}) })
}, },
......
src/views/register.vue
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="logo"> <div class="logo">
<a href="/"> <a href="/">
<span class="logo_text"> <span class="logo_text">
<img src="../assets/logo1.png" height="40px" v-if="$isMobile" /> <img src="../assets/logo1.png" style="height: 40px" v-if="$isMobile" />
<img src="../assets/logo.png" height="40px" v-else /> <img src="../assets/logo.png" style="height: 40px" v-else />
</span> </span>
</a> </a>
</div> </div>
......
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