diff --git a/src/api/application.js b/src/api/application.js
index 6d90106..c25328e 100644
--- a/src/api/application.js
+++ b/src/api/application.js
@@ -124,3 +124,50 @@ export function countRecord(data) {
}
});
}
+
+
+/**
+ * 广告列表
+ * @returns
+ */
+export function adget(params) {
+ return request({
+ url: "/api/ad",
+ method: "get",
+ params
+ });
+}
+
+/**
+* 广告新增单位
+* @returns
+*/
+export function adpost(data) {
+ return request({
+ url: `/api/miniAppPages`,
+ method: "post",
+ data
+ });
+}
+/**
+* 广告编辑详情
+* @returns
+*/
+export function adput(data) {
+ return request({
+ url: '/api/miniAppPages',
+ method: 'put',
+ data
+ })
+}
+
+/**
+* 广告删除商品
+* @returns
+*/
+export function addelete(params) {
+ return request({
+ url: "/api/miniAppPages/" + params,
+ method: "put",
+ });
+}
diff --git a/src/api/goxcx.js b/src/api/goxcx.js
new file mode 100644
index 0000000..4922962
--- /dev/null
+++ b/src/api/goxcx.js
@@ -0,0 +1,47 @@
+import request from "@/utils/request";
+
+/**
+ * 列表
+ * @returns
+ */
+export function miniAppPagesget(params) {
+ return request({
+ url: "/api/miniAppPages",
+ method: "get",
+ params
+ });
+}
+
+/**
+ * 新增单位
+ * @returns
+ */
+export function miniAppPagespost(data) {
+ return request({
+ url: `/api/miniAppPages`,
+ method: "post",
+ data
+ });
+}
+/**
+* 编辑详情
+* @returns
+*/
+export function miniAppPagesput(data) {
+ return request({
+ url: '/api/miniAppPages',
+ method: 'put',
+ data
+ })
+}
+
+/**
+ * 删除商品
+ * @returns
+ */
+export function miniAppPagesdelete(params) {
+ return request({
+ url: "/api/miniAppPages/" + params,
+ method: "delete",
+ });
+}
diff --git a/src/views/application/advertisement.vue b/src/views/application/advertisement.vue
new file mode 100644
index 0000000..5e9e97c
--- /dev/null
+++ b/src/views/application/advertisement.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 新增
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ {{ scope.row.showPosition == 'home' ? '首页' : "点餐页" }}
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 可见
+ 不可见
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+ {{ scope.row.conName }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.conUnit }}
+
+
+
-
+
+
{{ scope.row.balance }}
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{
- item.productName }}
-
-
-
+
{{ (scope.row.balance).toFixed(2) }}
+
+
+
+
+
+
+ {{ scope.row.conWarning }}
+
+
+
+
-
-
-
-
+
-
-
-
编辑
@@ -506,7 +511,7 @@ export default {
downloadLoading: false,
uploadLoading: false,
dialogVisible: false,
- consRecordItem: ''
+ consRecordItem: '',
};
},
mounted() {
@@ -541,7 +546,7 @@ export default {
}
},
toGoods(data) {
-
+
this.$router.push({
path: '/product/product',
query: {
@@ -569,6 +574,15 @@ export default {
console.log(error);
}
},
+ async conNameClick(row) {
+ await postapitbConsInfo([{
+ id: row.consId,
+ ...row,
+ shopId: localStorage.getItem('shopId')
+ }])
+ row.editNYD = 0
+ this.$message.success('修改成功')
+ },
computedClass(num) {
if (num > 0) {
return 'green'
@@ -639,8 +653,9 @@ export default {
this.tableData.data = res.content.map(v => {
const productIds = v.productId ? v.productId.split(',') : []
return {
- ...v,
- product: productIds.map((str, index) => {
+ ...v,
+ editNYD: 0,
+ product: productIds.map((str, index) => {
const startIndex = str.indexOf('_')
const productId = str.slice(0, startIndex)
const productName = str.slice(startIndex + 1, str.length)
@@ -815,6 +830,7 @@ export default {
},
// 显示耗材记录
async clicksee(item) {
+ console.log(item, '耗材记录')
this.consRecordItem = item
this.clickseetypedialogshow = true;
this.getConsRecord()
@@ -826,7 +842,7 @@ export default {
const res = await gettbConsInfoFlow({
page: this.clickseetableData.page,
size: this.clickseetableData.size,
- consId: this.consRecordItem.id,
+ consId: this.consRecordItem.consId,
conName: this.consRecordItem.conName,
shopId: localStorage.getItem("shopId")
});
diff --git a/src/views/invoicing/consumable/specifications.vue b/src/views/invoicing/consumable/specifications.vue
index bc8d843..38ae521 100644
--- a/src/views/invoicing/consumable/specifications.vue
+++ b/src/views/invoicing/consumable/specifications.vue
@@ -962,10 +962,8 @@ export default {
},
async submitForm(formName) {
if (this.dialogtitle == "编辑") {
- let { id, surplusStock } = this.surplusStocks;
await puttbProskuCon({
- id,
- surplusStock,
+ ...this.surplusStocks
});
this.$message({
message: "修改成功",
diff --git a/src/views/product/components/addGroup.vue b/src/views/product/components/addGroup.vue
index 01fc3b9..0529fde 100644
--- a/src/views/product/components/addGroup.vue
+++ b/src/views/product/components/addGroup.vue
@@ -163,6 +163,8 @@ export default {
type: 'success'
});
} catch (error) {
+ this.$emit('success', null)
+ this.loading = false
console.log(error)
}
}
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 0edffff..b476b85 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -97,7 +97,7 @@
-
@@ -228,6 +228,10 @@ export default {
console.log(error)
}
},
+ handleSizeChange(val) {
+ this.tableData.size = val
+ this.getTableData()
+ },
// 获取商品分类列表
async tbShopCategoryGet() {
try {
diff --git a/src/views/shop/components/goxcx.vue b/src/views/shop/components/goxcx.vue
new file mode 100644
index 0000000..c7b296b
--- /dev/null
+++ b/src/views/shop/components/goxcx.vue
@@ -0,0 +1,123 @@
+
+
+
+ 新增
+
+
+
+
+
+
+
+ {{ scope.row.status == 1 ? "可见" : "不可见" }}
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 可见
+ 不可见
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/shop/shop_configuration.vue b/src/views/shop/shop_configuration.vue
index 7e53fb1..9c55bec 100644
--- a/src/views/shop/shop_configuration.vue
+++ b/src/views/shop/shop_configuration.vue
@@ -6,6 +6,7 @@
+
@@ -13,6 +14,7 @@
+
@@ -23,11 +25,12 @@ import shopSetting from './components/shopSetting'
import notice from './components/notice'
import securitySetting from './components/securitySetting'
import extend from './components/extend'
+import goxcx from './components/goxcx'
export default {
components: {
shopInfo,
shopSetting,
- notice,securitySetting,extend
+ notice,securitySetting,extend,goxcx
},
data() {
return {
diff --git a/src/views/user_manage/user_list.vue b/src/views/user_manage/user_list.vue
index 9b87ba9..b785859 100644
--- a/src/views/user_manage/user_list.vue
+++ b/src/views/user_manage/user_list.vue
@@ -88,18 +88,19 @@
{{ scope.row.lastLoginAt | timeFilter }}
-
-
+
+
+ 编辑
+ 增减余额
+
-
-
+
+
@@ -107,6 +108,34 @@
@size-change="sizeChange" @current-change="paginationChange"
layout="total, sizes, prev, pager, next, jumper">
+
+
+
+
+
+ {{ userinfo.nickName }}
+
+
+
+ 增加
+ 备选项
+
+
+
+
+
+
+
+ 消费
+ 充值退款
+
+
+
+
+
@@ -132,6 +161,12 @@ export default {
size: 10,
loading: false,
total: 0
+ },
+ dialogVisible: false,
+ userinfo: {
+ nickName: '',
+ IncreaseDeduction: 1,
+ type: 1
}
};
},
@@ -146,6 +181,13 @@ export default {
this.getShopInfo();
},
methods: {
+ handleClose() {
+ this.userinfo = {}
+ },
+ editPop(d) {
+ this.dialogVisible = true
+ this.userinfo.nickName = d.nickName
+ },
toPage(type) {
const pages = {
charge: "charge_list",