Skip to content

Commit 7867c5d

Browse files
author
myxingke
committed
store去除注释
1 parent 6ffa6fc commit 7867c5d

File tree

3 files changed

+59
-59
lines changed

3 files changed

+59
-59
lines changed

‎src/module/manage/manage.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vue from 'vue'
22
import App from './App'
33
import Router from './router.js' //路由地址
4-
//import Store from './vuex/store/index'
4+
import Store from './vuex/store/index'
55
import IView from 'iview' //Iview
66
import 'iview/dist/styles/iview.css' // 使用 IVIEW CSS
77
import './assets/style/common/common.less' // 定制公共 less
@@ -35,7 +35,7 @@ Router.beforeEach(({meta, path}, from, next) => {
3535
new Vue({
3636
el: '#app',
3737
router: Router,
38-
//store: Store,
38+
store: Store,
3939
template: '<App/>',
4040
components: {App}
4141
})

‎src/module/merchant/pages/public/bind.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<p>2、在<span class="red">【开发&gt;基本配置】</span>建议取消其他同类第三方授权</p>
1414
<p>3、请点击下方“<span class="red">一键授权绑定</span>”，<span class="red">扫描</span>显示的二维码</p>
1515
<p>4、关注您自己的微信公众号并发送“<span class="red">绑定平台</span>”四个字</p>
16-
<p>5、收到&nbsp;<span class="red" style="font-size:12px;">恭喜您已经成功绑定到无限智能的代码兔微信公众平台</span>&nbsp;说明绑定成功</p>
17-
<p>6、<span class="red" style="font-size:12px;">如果没有弹出打开新页面，请检查是否被拦截了</span></p>
16+
<p>5、收到&nbsp;<span class="red">恭喜您已经成功绑定到无限智能的代码兔微信公众平台</span>&nbsp;说明绑定成功</p>
17+
<p>6、<span class="red">如果没有弹出打开新页面，请检查是否被拦截了</span></p>
1818
</div>
1919
<div class="footer">
2020
<div class="confirm">

‎src/module/merchant/pages/setting/merchant.vue‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,61 @@
22

33
<Row class="bp203">
44
<Col span="14">
5-
<Form ref="data" :model="data" :rules="ruleValidate" :label-width="80">
6-
<Form-item label="商户名称">
7-
{{data.name}} （如果需要改名请联系客服)
8-
</Form-item>
9-
<Form-item label="商户Logo">
10-
{{data.name}}
11-
</Form-item>
12-
<Form-item label="商户类型">
13-
<Tag color="green" v-if="data.type == 1">个人</Tag>
14-
<Tag color="blue" v-if="data.type == 2">企业</Tag>
15-
</Form-item>
16-
<Form-item label="是否认证">
17-
<Tag v-if="data.is_auth == 0">未认证</Tag>
18-
<Tag v-if="data.is_auth == 1" color="green">已认证</Tag>
19-
</Form-item>
20-
<Form-item label="帐号等级">
21-
<Tag color="green">普通商户</Tag>
22-
<!--<Tag color="blue">一级商户 todo 后面这个可能取消</Tag>-->
23-
</Form-item>
24-
<Form-item label="帐户余额">
25-
{{data.balance}} 元 <Tag color="blue">提现</Tag>
26-
</Form-item>
27-
<Form-item label="已消费金额">
28-
{{data.consume}} 元
29-
</Form-item>
30-
<Form-item label="积分">
31-
0
32-
</Form-item>
33-
<Form-item label="商户有效期">
34-
<div v-if="data.validity == 0">长期有效</div>
35-
<div v-if="data.validity != 0">{{ data.validity | formatDate('yyyy-MM-dd h:m') }} 充值</div>
36-
</Form-item>
37-
<Form-item label="联系人" prop="contacts">
38-
<Input v-model="data.contacts" placeholder="请填写联系人"></Input>
39-
</Form-item>
40-
<Form-item label="手机号码" prop="mobile">
41-
<Input v-model="data.mobile" placeholder="请填写手机号码"></Input>
42-
</Form-item>
43-
<Form-item label="电话号码" prop="tel">
44-
<Input v-model="data.tel" placeholder="请填写电话号码"></Input>
45-
</Form-item>
46-
<Form-item label="联系邮箱" prop="email">
47-
<Input v-model="data.email" placeholder="请填写邮箱地址"></Input>
48-
</Form-item>
49-
<Form-item label="支付宝" prop="alipay">
50-
<Input v-model="data.alipay" placeholder="支付宝提现帐号"></Input>
51-
</Form-item>
52-
<Form-item label="介绍" prop="desc">
53-
<Input v-model="data.desc" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></Input>
54-
</Form-item>
55-
<Form-item>
56-
<Button type="primary" @click="handleSubmit('data')">提交</Button>
57-
<Button type="ghost" @click="handleReset('data')" style="margin-left: 8px">重置</Button>
58-
</Form-item>
59-
</Form>
5+
<Form ref="data" :model="data" :rules="ruleValidate" :label-width="80">
6+
<Form-item label="商户名称">
7+
{{data.name}} （如果需要改名请联系客服)
8+
</Form-item>
9+
<Form-item label="商户Logo">
10+
{{data.name}}
11+
</Form-item>
12+
<Form-item label="商户类型">
13+
<Tag color="green" v-if="data.type == 1">个人</Tag>
14+
<Tag color="blue" v-if="data.type == 2">企业</Tag>
15+
</Form-item>
16+
<Form-item label="是否认证">
17+
<Tag v-if="data.is_auth == 0">未认证</Tag>
18+
<Tag v-if="data.is_auth == 1" color="green">已认证</Tag>
19+
</Form-item>
20+
<Form-item label="帐号等级">
21+
<Tag color="green">普通商户</Tag>
22+
<!--<Tag color="blue">一级商户 todo 后面这个可能取消</Tag>-->
23+
</Form-item>
24+
<Form-item label="帐户余额">
25+
{{data.balance}} 元 <Tag color="blue">提现</Tag>
26+
</Form-item>
27+
<Form-item label="已消费金额">
28+
{{data.consume}} 元
29+
</Form-item>
30+
<Form-item label="积分">
31+
0
32+
</Form-item>
33+
<Form-item label="商户有效期">
34+
<div v-if="data.validity == 0">长期有效</div>
35+
<div v-if="data.validity != 0">{{ data.validity | formatDate('yyyy-MM-dd h:m') }} 充值</div>
36+
</Form-item>
37+
<Form-item label="联系人" prop="contacts">
38+
<Input v-model="data.contacts" placeholder="请填写联系人"></Input>
39+
</Form-item>
40+
<Form-item label="手机号码" prop="mobile">
41+
<Input v-model="data.mobile" placeholder="请填写手机号码"></Input>
42+
</Form-item>
43+
<Form-item label="电话号码" prop="tel">
44+
<Input v-model="data.tel" placeholder="请填写电话号码"></Input>
45+
</Form-item>
46+
<Form-item label="联系邮箱" prop="email">
47+
<Input v-model="data.email" placeholder="请填写邮箱地址"></Input>
48+
</Form-item>
49+
<Form-item label="支付宝" prop="alipay">
50+
<Input v-model="data.alipay" placeholder="支付宝提现帐号"></Input>
51+
</Form-item>
52+
<Form-item label="介绍" prop="desc">
53+
<Input v-model="data.desc" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></Input>
54+
</Form-item>
55+
<Form-item>
56+
<Button type="primary" @click="handleSubmit('data')">提交</Button>
57+
<Button type="ghost" @click="handleReset('data')" style="margin-left: 8px">重置</Button>
58+
</Form-item>
59+
</Form>
6060
</Col>
6161
</Row>
6262

0 commit comments

Comments
 (0)