diff --git a/src/api/app.js b/src/api/app.js
index 71df0c2..2dc0df5 100644
--- a/src/api/app.js
+++ b/src/api/app.js
@@ -230,4 +230,36 @@ export function routineStatusApi(id, data) {
*/
export function routineInfo() {
return request.get(`config/setting/routine/config`)
-}
\ No newline at end of file
+}
+
+/**
+ * @description 查看app版本详情
+ */
+export function appDetail(id) {
+ return request.get(`app/version/detail/${id}`)
+}
+/**
+ * @description 创建app版本
+ */
+export function appCreate(data) {
+ return request.post(`app/version/create`, data)
+}
+/**
+ * @description 获取app版本列表
+ */
+export function appLst(data) {
+ return request.get(`app/version/lst`, data)
+}
+/**
+ * @description 编辑app版本详情
+ */
+export function appEdit(id,data) {
+ return request.post(`app/version/edit/${id}`,data)
+}
+/**
+ * @description 删除app版本
+ */
+export function appDelete(id) {
+ return request.post(`app/version/delete/${id}`)
+}
+
diff --git a/src/components/uploadPicture/index.vue b/src/components/uploadPicture/index.vue
index 3324404..f40ed0b 100644
--- a/src/components/uploadPicture/index.vue
+++ b/src/components/uploadPicture/index.vue
@@ -79,12 +79,12 @@
@click="checkPics"
>使用选中图片
点击上传
diff --git a/src/libs/settingMer.js b/src/libs/settingMer.js
index 1ef4a20..fa417ca 100644
--- a/src/libs/settingMer.js
+++ b/src/libs/settingMer.js
@@ -13,6 +13,8 @@ const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}`
const VUE_APP_API_URL_Two = process.env.VUE_APP_BASE_API_Two || `${location.origin}`
const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || (location.protocol === 'https:' ? 'wss' : 'ws') + ':' + location.hostname
const login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : ''
+
+console.log(VUE_APP_API_URL,'1111111111')
const SettingMer = {
// 服务器地址
httpUrl: VUE_APP_API_URL,
diff --git a/src/router/index.js b/src/router/index.js
index 3a2cd34..62c393b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -75,6 +75,7 @@ export const constantRoutes = [
name: 'Dashboard',
meta: { title: '控制台', icon: 'dashboard', affix: true }
}
+
]
},
{
@@ -180,6 +181,7 @@ export const constantRoutes = [
},
component: () => import('@/components/uploadVideo/index')
},
+
{ path: '*', redirect: roterPre + '/404', hidden: true }
]
diff --git a/src/router/modules/app.js b/src/router/modules/app.js
index 7d72cfc..3ee2a19 100644
--- a/src/router/modules/app.js
+++ b/src/router/modules/app.js
@@ -27,6 +27,13 @@ const appRouter =
noCache: true
},
component: () => import('@/views/app/wechat/menus/index')
+ }, {
+ path: 'version',
+ name: `appversion`,
+ meta: {
+ title: 'app版本管理'
+ },
+ component: () => import('@/views/system/appvison')
},
{
path: 'wechat/reply',
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 0f251a0..efc2309 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -128,13 +128,13 @@
- 审核
+ > -->
-
+
@@ -302,6 +302,9 @@
+
+
+
@@ -454,6 +457,7 @@ export default {
mer_name: "", //店铺名称
category_id: "", //商品分类
type_id: "",
+ first_margin:'',//首次支付缴纳保证金
info: "", //区
info1: "", //街道
info2: "", //村
@@ -542,6 +546,7 @@ export default {
},
autoUpdate: true,
timeVal: [],
+ edit:0
};
},
@@ -743,6 +748,7 @@ export default {
},
// 获取开启商户数
getHeadNum() {
+ console.log('2222222222222')
merchantCountApi()
.then(res => {
this.headeNum[0]["count"] = res.data.valid;
@@ -823,11 +829,13 @@ export default {
// 添加
onAdd() {
this.add = true;
+ this.edit=0
this.popFormVisible = true;
// this.$modalForm(merchantCreateApi()).then(() => this.getList(""));
},
// 编辑
async onEdit(id) {
+ this.edit=1
//调用获取商圈
this.popFormVisible = true; //开启编辑表单
this.add = false;
@@ -838,6 +846,7 @@ export default {
this.merid = res.mer_id;
this.form.mer_name = res.mer_name; //商户名称
this.form.category_id = res.category_id;
+ this.form.first_margin=res.first_margin;
this.form.type_id = res.type_id;
this.form.mer_account = res.mer_account;
this.form.mer_password = res.mer_password;
diff --git a/src/views/merchant/type/index.vue b/src/views/merchant/type/index.vue
index 7180815..a3a1297 100644
--- a/src/views/merchant/type/index.vue
+++ b/src/views/merchant/type/index.vue
@@ -16,6 +16,13 @@
}}
+
+
+ {{
+ scope.row.first_margin ? scope.row.first_margin + "元" : "无"
+ }}
+
+
@@ -78,6 +85,13 @@
单位：元
+
+
+
+
+ 单位：元
+
+
+
+ {{
+ formDetailValidate.first_margin ? formDetailValidate.first_margin : "暂无数据"
+ }}
@@ -234,7 +252,8 @@ export default {
is_allow_apply: "",
is_search_display: "",
type_code: "",
- is_sync_prod: ""
+ is_sync_prod: "",
+ first_margin:0
},
ruleValidate: {
type_name: [
@@ -311,6 +330,19 @@ export default {
};
this.$refs.tree && this.$refs.tree.setCheckedKeys([]);
},
+ //获取保证金
+
+ fimargin(e){
+ console.log(e,this.formValidate.margin,e>this.formValidate.margin)
+ if(this.formValidate.is_margin == 1){
+ if(Number(e)>Number(this.formValidate.margin)){
+ this.$message({
+ message: '警告,首次缴纳保证金不能超过店铺保证金',
+ type: 'warning'
+ });
+ }
+ }
+ },
//获取权限
jurisdiction() {
storeJurisdictionApi().then((res) => {
@@ -361,6 +393,7 @@ export default {
type_info: row.type_info,
is_margin: row.is_margin || 0,
margin: row.margin || 0,
+ first_margin: row.first_margin || 0,
auth: row.auth_ids,
description: row.description,
is_allow_apply: row.is_allow_apply.toString(),