diff --git a/common/css/common.css b/common/css/common.css
index ab4d191..4ca190a 100644
--- a/common/css/common.css
+++ b/common/css/common.css
@@ -2734,4 +2734,11 @@ input:disabled {
.border-main {
border: 1px solid #a92924;
+}
+
+.line-1{
+ text-overflow: ellipsis;
+ overflow: hidden;
+ word-break: break-all;
+ white-space: nowrap;
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 5712835..51cd7fd 100644
--- a/pages.json
+++ b/pages.json
@@ -185,6 +185,30 @@
"enablePullDownRefresh" : false
}
},
+ {
+ "path" : "pages/index/self-support/companyQuote",
+ "style" :
+ {
+ "navigationBarTitleText" : "金久信自营",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/index/self-support/selectType",
+ "style" :
+ {
+ "navigationBarTitleText" : "金久信自营",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/index/self-support/productQuote",
+ "style" :
+ {
+ "navigationBarTitleText" : "金久信自营",
+ "enablePullDownRefresh" : false
+ }
+ },
{
"path" : "pages/index/server/server",
"style" :
@@ -200,6 +224,30 @@
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/index/shop/detail",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/yellowPage/list",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/yellowPage/info",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false
+ }
}
],
"globalStyle": {
diff --git a/pages/index/self-support/companyQuote.vue b/pages/index/self-support/companyQuote.vue
new file mode 100644
index 0000000..b7679a4
--- /dev/null
+++ b/pages/index/self-support/companyQuote.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 服务内容:{{ item.name }}
+
+ 业务编号:{{ content.code }}
+
+ 服务服务项目: {{ content.title }}
+ {{ content.amount }}元/次
+
+ 备注: {{ item.remark }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 增加考察对象
+
+
+
+ 删除该对象
+
+
+
+
+
+
+
+
+
+ 总价:
+ {{ totalAmount }}元
+
+ 客服联系方式: 0771-3923001
+
+
+ 立即支付
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/self-support/productQuote.vue b/pages/index/self-support/productQuote.vue
new file mode 100644
index 0000000..815d6fd
--- /dev/null
+++ b/pages/index/self-support/productQuote.vue
@@ -0,0 +1,187 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 服务内容:{{ item.name }}
+
+ 业务编号:{{ content.code }}
+
+ 服务服务项目: {{ content.title }}
+ {{ content.amount }}元/次
+
+ 备注: {{ item.remark }}
+
+
+
+
+
+
+
+
+
+
+ {{ contentNameList.join() }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 增加考察对象
+
+
+
+ 删除该对象
+
+
+
+
+
+
+
+
+
+ 总价:
+ {{ totalAmount }}元
+
+ 客服联系方式: 0771-3923001
+
+
+ 立即支付
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/self-support/selectType.vue b/pages/index/self-support/selectType.vue
new file mode 100644
index 0000000..c0cf16c
--- /dev/null
+++ b/pages/index/self-support/selectType.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/self-support/self-support.vue b/pages/index/self-support/self-support.vue
index 553cbbc..3abb70e 100644
--- a/pages/index/self-support/self-support.vue
+++ b/pages/index/self-support/self-support.vue
@@ -1,366 +1,207 @@
-
-
-
-
-
-
-
- 自营钢城
- 平台服务
- 特产商城
-
-
-
- 交易区域:
-
-
- {{ data.label }}
- ({{ data.children.length }})
-
-
+
+
+
+
+
+
+
+ 自营钢城
+ 平台服务
+ 特产商城
+
+
+
+ 交易区域:
+
+
+
+ 下单询价 >
+
+
+
+
+ 合作单位/联营单位
+
+
+
+
+
+
+ 主营: {{ item.businessCard.mainBusiness }}
+
+
+
+
+
+
-
- 下单询价
-
-
-
-
- 合作单位/联营单位
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/pages/index/shop/detail.vue b/pages/index/shop/detail.vue
index 96cc36c..c6c5d30 100644
--- a/pages/index/shop/detail.vue
+++ b/pages/index/shop/detail.vue
@@ -1,259 +1,111 @@
-
-
-
-
-
-
-
-
- 地区:
-
-
- {{ data.label }}
- ({{ data.children.length }})
-
-
+
+
+
+
+
+
+
+ 首页
+
+ 特产商城
+
+ {{ info.name }}
+
+
+
+
+
+
+
+
+
+ {{ info.name }}
+
+ 产品介绍:
+ {{ info.desc }}
+
+
+
+ 零售价:
+ ¥{{ info.amount }}
+
+
+ 加入购物车
+ 立即购买
+
+
+
+
+
+ 商品介绍
+
+
-
-
-
-
-
- 分类:
- 全部
- 果蔬农产品
- 特产食品粮油肉蛋禽
- 茶类
- 酒类
- 工艺类
- 旅游户外商用
- 日用美容洗涤
- 电子产品
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/index/shop/shop.vue b/pages/index/shop/shop.vue
index 96cc36c..df030ca 100644
--- a/pages/index/shop/shop.vue
+++ b/pages/index/shop/shop.vue
@@ -1,259 +1,212 @@
-
-
-
-
-
-
-
-
- 地区:
-
-
- {{ data.label }}
- ({{ data.children.length }})
-
-
+
+
+
+
+
+
+
+
+ 地区:
+
+
+
+
+
+
+
+ 分类:
+ 全部
+ {{ item.name }}
+
-
-
-
-
-
- 分类:
- 全部
- 果蔬农产品
- 特产食品粮油肉蛋禽
- 茶类
- 酒类
- 工艺类
- 旅游户外商用
- 日用美容洗涤
- 电子产品
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
diff --git a/static/images/selfSupport/company.jpg b/static/images/selfSupport/company.jpg
new file mode 100644
index 0000000..09d8c92
Binary files /dev/null and b/static/images/selfSupport/company.jpg differ
diff --git a/static/images/selfSupport/product.jpg b/static/images/selfSupport/product.jpg
new file mode 100644
index 0000000..85b50cb
Binary files /dev/null and b/static/images/selfSupport/product.jpg differ
diff --git a/static/images/selfSupport/swiper.jpg b/static/images/selfSupport/swiper.jpg
new file mode 100644
index 0000000..7383883
Binary files /dev/null and b/static/images/selfSupport/swiper.jpg differ
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/add.js
new file mode 100644
index 0000000..272186f
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/add.js
@@ -0,0 +1,25 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/coopExplore/config/sys/add 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.add({
+ dbName: 'jjx-coop-config',
+ dataJson: data
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/delete.js
new file mode 100644
index 0000000..1223d3e
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/delete.js
@@ -0,0 +1,25 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/coopExplore/config/sys/delete 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.deleteById({
+ dbName: 'jjx-coop-config',
+ id: data._id
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/list.js
new file mode 100644
index 0000000..cdccaee
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/list.js
@@ -0,0 +1,28 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/coopExplore/config/sys/list 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ res = await vk.baseDao.getTableData({
+ dbName: 'jjx-coop-config',
+ sortArr: [
+ { name: "sort", type: "asc" },
+ { name: "_id", type: "desc" },
+ ],
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/update.js
new file mode 100644
index 0000000..3439557
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/update.js
@@ -0,0 +1,26 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/coopExplore/config/sys/update 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.updateById({
+ dbName: 'jjx-coop-config',
+ dataJson: data,
+ id: data._id
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/add.js
new file mode 100644
index 0000000..628a67f
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/add.js
@@ -0,0 +1,25 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/article/category/sys/add 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.add({
+ dbName: 'jjx-goods-category',
+ dataJson: data
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/delete.js
new file mode 100644
index 0000000..8d8e37d
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/delete.js
@@ -0,0 +1,25 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/article/category/sys/delete 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.deleteById({
+ dbName: 'jjx-goods-category',
+ id: data._id
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/list.js
new file mode 100644
index 0000000..76bac98
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/list.js
@@ -0,0 +1,28 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/article/category/sys/list 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ res = await vk.baseDao.getTableData({
+ dbName: 'jjx-goods-category',
+ sortArr: [
+ { name: "sort", type: "asc" },
+ { name: "_id", type: "desc" },
+ ],
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/update.js
new file mode 100644
index 0000000..69df892
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/update.js
@@ -0,0 +1,26 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/article/category/sys/update 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.updateById({
+ dbName: 'jjx-goods-category',
+ dataJson: data,
+ id: data._id
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/add.js
new file mode 100644
index 0000000..2745800
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/add.js
@@ -0,0 +1,29 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/article/category/sys/add 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.add({
+ dbName: 'jjx-goods',
+ dataJson: {
+ ...data, ...{
+ viewNum: 0,
+ }
+ }
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/delete.js
new file mode 100644
index 0000000..5237bad
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/delete.js
@@ -0,0 +1,25 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/article/category/sys/delete 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.deleteById({
+ dbName: 'jjx-goods',
+ id: data._id
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/list.js
new file mode 100644
index 0000000..c995ff5
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/list.js
@@ -0,0 +1,34 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/article/category/sys/list 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+
+ res = await vk.baseDao.getTableData({
+ dbName: 'jjx-goods',
+ foreignDB: [
+ {
+ dbName: "jjx-goods-category",
+ localKey: "parentId",
+ foreignKey: "_id",
+ as: "category",
+ limit: 1,
+ },
+
+ ]
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/update.js
new file mode 100644
index 0000000..28982b6
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/update.js
@@ -0,0 +1,26 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/article/category/sys/update 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.updateById({
+ dbName: 'jjx-goods',
+ dataJson: data,
+ id: data._id
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeCoop.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeCoop.js
new file mode 100644
index 0000000..f9d96b6
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeCoop.js
@@ -0,0 +1,32 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url admin/system/user/sys/changeCoop 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ const company = await vk.baseDao.findById({
+ dbName: "uni-id-users",
+ id: data.id
+ });
+
+ const isCoop = (!company.isCoop || company.isCoop === 0) ? 1 : 0
+ await vk.baseDao.updateById({
+ dbName: "uni-id-users",
+ id: data.id,
+ dataJson: {
+ isCoop
+ }
+ });
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/coop/config/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/coop/config/pub/getList.js
new file mode 100644
index 0000000..663d22a
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/coop/config/pub/getList.js
@@ -0,0 +1,31 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url client/coop/config/pub/getList 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+
+ res = await vk.baseDao.select({
+ dbName: 'jjx-coop-config',
+ whereJson: {
+ type: data.type,
+ },
+ sortArr: [
+ {name: "sort", type: "asc"},
+ {name: "_id", type: "desc"},
+ ],
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/category/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/category/pub/getList.js
new file mode 100644
index 0000000..a89b9d6
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/category/pub/getList.js
@@ -0,0 +1,28 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url client/goods/category/pub/getList 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ res = await vk.baseDao.getTableData({
+ dbName: 'jjx-goods-category',
+ sortArr: [
+ { name: "sort", type: "asc" },
+ { name: "_id", type: "desc" },
+ ],
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/kh/add.js
new file mode 100644
index 0000000..f22e98c
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/kh/add.js
@@ -0,0 +1,29 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url client/article/list/kh/add 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ await vk.baseDao.add({
+ dbName: 'jjx-article',
+ dataJson: {
+ ...data, ...{
+ viewNum: 0,
+ downloadNum: 0,
+ }
+ }
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getDetail.js
new file mode 100644
index 0000000..6a76e08
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getDetail.js
@@ -0,0 +1,25 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url client/goods/list/pub/getDetail 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: "" };
+ // 业务逻辑开始-----------------------------------------------------------
+
+ res = await vk.baseDao.findById({
+ dbName: "jjx-goods",
+ id: data.id
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getList.js
new file mode 100644
index 0000000..652ba83
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getList.js
@@ -0,0 +1,39 @@
+'use strict';
+module.exports = {
+ /**
+ * XXXnameXXX
+ * @url client/goods/list/pub/getList 前端调用的url参数地址
+ * data 请求参数
+ * @param {String} params1 参数1
+ */
+ main: async (event) => {
+ let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+ let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+ let {uid} = data;
+ let res = {code: 0, msg: ""};
+ // 业务逻辑开始-----------------------------------------------------------
+ const {pageIndex, pageSize, parentId, keyword, city} = data
+ const whereJson = {parentId}
+ if (vk.pubfn.isNotNull(keyword)) {
+ whereJson.name = new RegExp(keyword)
+ }
+ if (vk.pubfn.isNotNull(city)) {
+ whereJson.address.city.code = city
+ }
+
+ res = await vk.baseDao.select({
+ dbName: 'jjx-goods',
+ getCount: true,
+ pageIndex,
+ pageSize,
+ whereJson,
+ sortArr: [
+ {name: "_id", type: "desc"}
+ ],
+ });
+
+
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
index c298412..c59b098 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
@@ -12,21 +12,16 @@ module.exports = {
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid} = data;
let res = {code: 0, msg: ""};
+ const whereJson = {
+ accountType: 2
+ }
+ if (!vk.pubfn.isNull(data.isCoop)) whereJson.isCoop = data.isCoop;
// 业务逻辑开始-----------------------------------------------------------
-
-
res = await vk.baseDao.getTableData({
dbName: dbName.user,
- whereJson: {
- // fadadaConfirm: true,
- ...data,
- ...{
- accountType: 2,
- businessCard: _.exists(true),
- }
- }
+ whereJson
});
-
+ console.log('whereJson', whereJson)
// 业务逻辑结束-----------------------------------------------------------
return res;
}