diff --git a/common/css/common.css b/common/css/common.css index 4ca190a..78d1e32 100644 --- a/common/css/common.css +++ b/common/css/common.css @@ -2510,6 +2510,11 @@ input:disabled { margin-left: 35rpx; } + +.ml-80 { + margin-left: 80rpx; +} + .mt-10 { margin-top: 10rpx; } diff --git a/pages.json b/pages.json index 4fe0837..97d811f 100644 --- a/pages.json +++ b/pages.json @@ -296,7 +296,16 @@ "navigationBarTitleText" : "订单列表", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/index/old/release", + "style" : + { + "navigationBarTitleText" : "旧货交易", + "enablePullDownRefresh" : false + } } + ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/index/old/list/list.vue b/pages/index/old/list/list.vue index 2781bf7..930236a 100644 --- a/pages/index/old/list/list.vue +++ b/pages/index/old/list/list.vue @@ -1,464 +1,494 @@ - - + } +} + - +.child-cate { + background-color: #DB8382; + color: white; + margin-top: 10rpx; + border-radius: 15rpx; + padding: 0 20rpx; +} + diff --git a/pages/index/old/my.vue b/pages/index/old/my.vue new file mode 100644 index 0000000..6da0fee --- /dev/null +++ b/pages/index/old/my.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/pages/index/old/old.vue b/pages/index/old/old.vue index 6ee5440..c373bf3 100644 --- a/pages/index/old/old.vue +++ b/pages/index/old/old.vue @@ -1,602 +1,609 @@ diff --git a/pages/index/old/release.vue b/pages/index/old/release.vue new file mode 100644 index 0000000..675e600 --- /dev/null +++ b/pages/index/old/release.vue @@ -0,0 +1,46 @@ + + + \ No newline at end of file diff --git a/pages/index/old/release/type_0.vue b/pages/index/old/release/type_0.vue new file mode 100644 index 0000000..a973c06 --- /dev/null +++ b/pages/index/old/release/type_0.vue @@ -0,0 +1,457 @@ + + + + + + + \ No newline at end of file diff --git a/pages/index/old/release/type_1.vue b/pages/index/old/release/type_1.vue new file mode 100644 index 0000000..038c597 --- /dev/null +++ b/pages/index/old/release/type_1.vue @@ -0,0 +1,519 @@ + + + + + + + \ No newline at end of file diff --git a/pages/index/old/release/type_2.vue b/pages/index/old/release/type_2.vue new file mode 100644 index 0000000..61ebf56 --- /dev/null +++ b/pages/index/old/release/type_2.vue @@ -0,0 +1,519 @@ + + + + + + + \ No newline at end of file diff --git a/pages/index/old/release/type_3.vue b/pages/index/old/release/type_3.vue new file mode 100644 index 0000000..f9c7538 --- /dev/null +++ b/pages/index/old/release/type_3.vue @@ -0,0 +1,235 @@ + + + + + + + \ No newline at end of file diff --git a/pages/user/components/equity.vue b/pages/user/components/equity.vue index 2f229d1..3b305df 100644 --- a/pages/user/components/equity.vue +++ b/pages/user/components/equity.vue @@ -1,720 +1,758 @@ diff --git a/static/images/old/liucheng2.png b/static/images/old/liucheng2.png new file mode 100644 index 0000000..75c2a67 Binary files /dev/null and b/static/images/old/liucheng2.png differ diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/add.js new file mode 100644 index 0000000..971d94d --- /dev/null +++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/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-user-level', + dataJson: data + }); + + + // 业务逻辑结束----------------------------------------------------------- + return res; + } +} diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/delete.js new file mode 100644 index 0000000..828b5b2 --- /dev/null +++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/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-user-level', + id: data._id + }); + + + // 业务逻辑结束----------------------------------------------------------- + return res; + } +} diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/list.js new file mode 100644 index 0000000..d77ce38 --- /dev/null +++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/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-user-level', + sortArr: [ + { name: "sort", type: "asc" }, + { name: "_id", type: "desc" }, + ], + }); + + + // 业务逻辑结束----------------------------------------------------------- + return res; + } +} diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/update.js new file mode 100644 index 0000000..48da09d --- /dev/null +++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/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-user-level', + dataJson: data, + id: data._id + }); + + + // 业务逻辑结束----------------------------------------------------------- + return res; + } +} diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/add.js new file mode 100644 index 0000000..0791540 --- /dev/null +++ b/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/add.js @@ -0,0 +1,24 @@ +'use strict'; +module.exports = { + /** + * XXXnameXXX + * @url client/old/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 {uid} = data; + let res = {code: 0, msg: ""}; + // 业务逻辑开始----------------------------------------------------------- + + await vk.baseDao.add({ + dbName: "jjx-old", + dataJson: data + }) + + // 业务逻辑结束----------------------------------------------------------- + return res; + } +} diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/getList.js new file mode 100644 index 0000000..68dec71 --- /dev/null +++ b/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/getList.js @@ -0,0 +1,27 @@ +'use strict'; +module.exports = { + /** + * XXXnameXXX + * @url client/old/kh/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 vl.baseDao.select({ + dbName: "jjx-old", + whereJson: { + uid + } + }) + + + // 业务逻辑结束----------------------------------------------------------- + return res; + } +} diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getList.js new file mode 100644 index 0000000..fec04f4 --- /dev/null +++ b/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getList.js @@ -0,0 +1,29 @@ +'use strict'; +module.exports = { + /** + * XXXnameXXX + * @url client/old/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, pageIndex, pageSize, type} = data; + let res = {code: 0, msg: ""}; + // 业务逻辑开始----------------------------------------------------------- + + res = await vk.baseDao.select({ + dbName: "jjx-old", + pageIndex, + pageSize, + whereJson: { + type: type + }, + }); + + + // 业务逻辑结束----------------------------------------------------------- + return res; + } +} diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js index 5fe0c26..bc7c762 100644 --- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js +++ b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js @@ -72,8 +72,9 @@ module.exports = { person, company, accountType: accountType, - nickname: accountType == 1?person.personName: company.companyName, - authStatus: -1 + nickname: accountType == 1 ? person.personName: company.companyName, + authStatus: -1, + userLevel: -1, } }); }else {