leisure-core 0.4.26 → 0.4.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/le-cp/src/sub.vue
CHANGED
|
@@ -28,10 +28,13 @@
|
|
|
28
28
|
</el-form-item>
|
|
29
29
|
<el-form-item v-rfooter>
|
|
30
30
|
<div style="display: flex">
|
|
31
|
+
<div v-if="!form.cp_link_nick" class="warning-text">
|
|
32
|
+
必须绑定联系人,未绑定,无法统计佣金
|
|
33
|
+
</div>
|
|
31
34
|
<el-button type="primary" @click="onSubmit">保存</el-button>
|
|
32
35
|
<le-button-qr
|
|
33
36
|
:qrCodeUrl="qrcode"
|
|
34
|
-
:fileName="form.
|
|
37
|
+
:fileName="form.cp_name"
|
|
35
38
|
@qrMake="makeQrcode"
|
|
36
39
|
></le-button-qr>
|
|
37
40
|
<el-button @click="close()">取消</el-button>
|
|
@@ -160,3 +163,12 @@ export default {
|
|
|
160
163
|
},
|
|
161
164
|
};
|
|
162
165
|
</script>
|
|
166
|
+
<style scoped>
|
|
167
|
+
.warning-text {
|
|
168
|
+
color: red;
|
|
169
|
+
font-size: 20px;
|
|
170
|
+
font-weight: bold;
|
|
171
|
+
padding-left: 20px;
|
|
172
|
+
width: 500px;
|
|
173
|
+
}
|
|
174
|
+
</style>
|
|
@@ -6,7 +6,9 @@
|
|
|
6
6
|
</el-form-item>
|
|
7
7
|
</el-form>
|
|
8
8
|
<el-table :data="tableData" border row-key="id" stripe style="width: 100%">
|
|
9
|
-
<el-table-column prop="cname" label="
|
|
9
|
+
<el-table-column prop="cname" label="分销类别" width="180">
|
|
10
|
+
</el-table-column>
|
|
11
|
+
<el-table-column prop="ccode" label="分销代码" width="80">
|
|
10
12
|
</el-table-column>
|
|
11
13
|
<el-table-column prop="crate1" label="佣金比例"> </el-table-column>
|
|
12
14
|
<!-- <el-table-column prop="crate2" label="二级佣金比例"> </el-table-column> -->
|
|
@@ -6,9 +6,12 @@
|
|
|
6
6
|
label-position="left"
|
|
7
7
|
label-width="110px"
|
|
8
8
|
>
|
|
9
|
-
<el-form-item label="
|
|
9
|
+
<el-form-item label="分销名称" prop="cname">
|
|
10
10
|
<el-input v-model="form.cname"></el-input>
|
|
11
11
|
</el-form-item>
|
|
12
|
+
<el-form-item label="分销代码" prop="ccode">
|
|
13
|
+
<el-input v-model="form.ccode"></el-input>
|
|
14
|
+
</el-form-item>
|
|
12
15
|
<el-form-item label="佣金比例" prop="crate1">
|
|
13
16
|
<el-input-number
|
|
14
17
|
v-model="form.crate1"
|
|
@@ -56,6 +59,7 @@ export default {
|
|
|
56
59
|
trigger: "blur",
|
|
57
60
|
},
|
|
58
61
|
],
|
|
62
|
+
ccode: [{ required: true, message: "请输入分销代码", trigger: "blur" }],
|
|
59
63
|
crate1: [
|
|
60
64
|
{ required: true, message: "请输入一级佣金比例", trigger: "blur" },
|
|
61
65
|
],
|
package/le-mpurl/src/main.vue
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
<el-table-column prop="code" label="编码" width="50"> </el-table-column>
|
|
12
12
|
<el-table-column prop="mp_path" label="小程序页面" width="150">
|
|
13
13
|
</el-table-column>
|
|
14
|
+
<el-table-column prop="title" label="标题" width="150"> </el-table-column>
|
|
14
15
|
<el-table-column prop="mp_param" label="参数" width="50"> </el-table-column>
|
|
15
16
|
<el-table-column prop="wx_url" label="微信url" width="100">
|
|
16
17
|
</el-table-column>
|
|
@@ -56,12 +57,18 @@ export default {
|
|
|
56
57
|
let code = row.code;
|
|
57
58
|
let param = {};
|
|
58
59
|
param.code = code;
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
60
|
+
param.isForce = true;
|
|
61
|
+
getMpLink(param)
|
|
62
|
+
.then((res) => {
|
|
63
|
+
let url = res.data.data;
|
|
64
|
+
if (url) {
|
|
65
|
+
this.list();
|
|
66
|
+
this.$message.success("生成成功");
|
|
67
|
+
}
|
|
68
|
+
})
|
|
69
|
+
.catch((err) => {
|
|
70
|
+
this.$message.error("生成失败");
|
|
71
|
+
});
|
|
65
72
|
},
|
|
66
73
|
},
|
|
67
74
|
};
|
package/le-user/src/sub.vue
CHANGED
|
@@ -86,8 +86,9 @@
|
|
|
86
86
|
<div style="display: flex">
|
|
87
87
|
<el-button type="info" @click="close()">取消</el-button>
|
|
88
88
|
<le-button-qr
|
|
89
|
+
v-if="ruleUserForm.utype == 2"
|
|
89
90
|
:qrCodeUrl="qrcode"
|
|
90
|
-
:fileName="ruleUserForm.id"
|
|
91
|
+
:fileName="ruleUserForm.nick ?? ruleUserForm.id"
|
|
91
92
|
@qrMake="makeQrcode"
|
|
92
93
|
></le-button-qr>
|
|
93
94
|
<le-button type="primary" text="保存" @click="save"></le-button>
|
|
@@ -212,11 +213,11 @@ export default {
|
|
|
212
213
|
} else {
|
|
213
214
|
this.$message.error(res.data.info);
|
|
214
215
|
}
|
|
215
|
-
this.close();
|
|
216
|
+
// this.close();
|
|
216
217
|
});
|
|
217
218
|
} else {
|
|
218
219
|
console.log("error submit!!");
|
|
219
|
-
this.close();
|
|
220
|
+
// this.close();
|
|
220
221
|
}
|
|
221
222
|
});
|
|
222
223
|
},
|