diff --git a/components/diy-components/diy-member-info.vue b/components/diy-components/diy-member-info.vue index 1acff02..a8d6b82 100644 --- a/components/diy-components/diy-member-info.vue +++ b/components/diy-components/diy-member-info.vue @@ -36,7 +36,7 @@ - 推荐码:{{memberInfo.rcode}} 复制 + @@ -67,7 +67,7 @@ {{ memberInfo.member_level_name }} - 推荐码:{{memberInfo.rcode}} 复制 + diff --git a/manifest.json b/manifest.json index 8d084e7..8d0fddf 100644 --- a/manifest.json +++ b/manifest.json @@ -1,8 +1,8 @@ { "name" : "山野乡涧", - "appid" : "__UNI__E00B9A8", + "appid" : "__UNI__FF65C97", "description" : "", - "versionName" : "5.1.2", + "versionName" : "1.0.1", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md index 7c91d7b..f4e08bd 100644 --- a/node_modules/jweixin-module/README.md +++ b/node_modules/jweixin-module/README.md @@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js ## 使用 ```js -var jweixin = require('jweixin-module') -jweixin.ready(function(){ +var wx = require('jweixin-module') +wx.ready(function(){ // TODO }); ``` diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json index 5b6160e..4f3cd45 100644 --- a/node_modules/jweixin-module/package.json +++ b/node_modules/jweixin-module/package.json @@ -1,40 +1,41 @@ { - "_args": [ - [ - "jweixin-module@1.6.0", - "D:\\Web-Object\\rush-goods" - ] - ], - "_from": "jweixin-module@1.6.0", - "_id": "jweixin-module@1.6.0", + "_from": "jweixin-module", + "_id": "jweixin-module@1.4.1", "_inBundle": false, - "_integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==", + "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==", "_location": "/jweixin-module", "_phantomChildren": {}, "_requested": { - "type": "version", + "type": "tag", "registry": true, - "raw": "jweixin-module@1.6.0", + "raw": "jweixin-module", "name": "jweixin-module", "escapedName": "jweixin-module", - "rawSpec": "1.6.0", + "rawSpec": "", "saveSpec": null, - "fetchSpec": "1.6.0" + "fetchSpec": "latest" }, "_requiredBy": [ + "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", - "_spec": "1.6.0", - "_where": "D:\\Web-Object\\rush-goods", + "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz", + "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1", + "_spec": "jweixin-module", + "_where": "E:\\demo\\niushop_uniapp", "author": { "name": "Shengqiang Guo" }, "bugs": { "url": "https://github.com/zhetengbiji/jweixin-module/issues" }, + "bundleDependencies": false, + "deprecated": false, "description": "微信JS-SDK", - "devDependencies": {}, + "devDependencies": { + "textfile": "^1.2.0", + "uglify-js": "^3.4.9" + }, "homepage": "https://github.com/zhetengbiji/jweixin-module#readme", "keywords": [ "wxjssdk", @@ -45,12 +46,15 @@ "wx" ], "license": "ISC", - "main": "lib/index.js", + "main": "out/index.js", "name": "jweixin-module", "repository": { "type": "git", "url": "git+https://github.com/zhetengbiji/jweixin-module.git" }, - "scripts": {}, - "version": "1.6.0" + "scripts": { + "build": "node build", + "prepublish": "npm run build" + }, + "version": "1.4.1" } diff --git a/package-lock.json b/package-lock.json index a6680b7..1daf23c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,71 @@ { + "name": "miaogou.cdlfjy.com", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, + "packages": { + "": { + "dependencies": { + "jweixin-module": "^1.4.1", + "vant": "^2.12.51" + } + }, + "node_modules/@babel/runtime": { + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz", + "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==", + "dependencies": { + "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@vant/icons": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz", + "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg==" + }, + "node_modules/@vant/popperjs": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.3.0.tgz", + "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==" + }, + "node_modules/@vue/babel-helper-vue-jsx-merge-props": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz", + "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==" + }, + "node_modules/jweixin-module": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", + "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==" + }, + "node_modules/regenerator-runtime": { + "version": "0.13.10", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", + "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==" + }, + "node_modules/vant": { + "version": "2.12.51", + "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.51.tgz", + "integrity": "sha512-0dZHcBWwKdQvgvAMr5hqObuwkHRn51c7ReLVDV/Ijp1twZ/9/JGMPKVCp1ebpzFAONudyDvu42adrkFUhheaUA==", + "dependencies": { + "@babel/runtime": "7.x", + "@vant/icons": "^1.7.1", + "@vant/popperjs": "^1.1.0", + "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", + "vue-lazyload": "1.2.3" + }, + "peerDependencies": { + "vue": ">= 2.6.0" + } + }, + "node_modules/vue-lazyload": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz", + "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g==" + } + }, "dependencies": { "@babel/runtime": { "version": "7.19.4", @@ -20,11 +85,6 @@ "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.3.0.tgz", "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==" }, - "@vant/weapp": { - "version": "1.10.14", - "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.10.14.tgz", - "integrity": "sha512-5usuhoN1kiOV6pzrdVzHrAux6DupKlGd9w+yYc992Zy1n1wHLZMb1dGM3+xtbNE3tpWE2qv95vIFSMpJRFyE7Q==" - }, "@vue/babel-helper-vue-jsx-merge-props": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz", @@ -52,11 +112,6 @@ "vue-lazyload": "1.2.3" } }, - "vant-weapp": { - "version": "0.5.29", - "resolved": "https://registry.npmjs.org/vant-weapp/-/vant-weapp-0.5.29.tgz", - "integrity": "sha512-RMc0Ga914XFwspw2WuOMU8bOHlIkua8X1DoQ/KPnGQzjwT1uEL4S7W186EmaHF1wN2krB9BVd0LdRRt39dGh6Q==" - }, "vue-lazyload": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz", diff --git a/pages.json b/pages.json index 0195c8d..b370baf 100644 --- a/pages.json +++ b/pages.json @@ -1010,6 +1010,12 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "member/balance_transfer", + "style": { + "navigationStyle": "custom" + } }, { "path": "member/balance_detail", diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue index 5108070..ab285e0 100644 --- a/pages/goods/detail.vue +++ b/pages/goods/detail.vue @@ -404,7 +404,7 @@ - diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue index 7c70976..8539938 100644 --- a/pages_promotion/fenxiao/ranking_list.vue +++ b/pages_promotion/fenxiao/ranking_list.vue @@ -32,8 +32,8 @@ - 分销佣金 - {{ info.today_commission}}元 + 业绩佣金 + {{ info.today_commission}} @@ -43,7 +43,7 @@ - 佣金排行 + 业绩排行 您排行第{{ ranking }}名 @@ -74,7 +74,7 @@ - 佣金排行 + 业绩排行 推广排行 @@ -88,7 +88,7 @@ {{ item.nickname }} - ￥{{ item.total_commission|moneyFormat }} + {{ item.total_commission|moneyFormat }} {{ item.child_num }}人 diff --git a/pages_rush/order/list.vue b/pages_rush/order/list.vue index f866389..dca19ca 100644 --- a/pages_rush/order/list.vue +++ b/pages_rush/order/list.vue @@ -297,11 +297,11 @@ export default { name: this.$lang('waitDelivery'), id: 'status_3' }, - { - status: 'wait_use', - name: this.$lang('waitEvaluate'), - id: 'status_4' - } + // { + // status: 'wait_use', + // name: this.$lang('waitEvaluate'), + // id: 'status_4' + // } ]; }, operation(action, orderData) { diff --git a/pages_tool/member/apply_withdrawal.vue b/pages_tool/member/apply_withdrawal.vue index 655b3ea..29f0a0b 100644 --- a/pages_tool/member/apply_withdrawal.vue +++ b/pages_tool/member/apply_withdrawal.vue @@ -23,18 +23,18 @@ 提现金额： - {{ $lang('common.currencySymbol') }} + - 可提现余额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }} + 可提现余额：{{ withdrawInfo.member_info.balance_money | moneyFormat }} 全部提现 - 最小提现金额为{{ $lang('common.currencySymbol') }}{{ withdrawInfo.config.min | moneyFormat }} + 最小提现金额为{{ withdrawInfo.config.min | moneyFormat }} ，手续费为{{ withdrawInfo.config.rate + '%' }} @@ -42,11 +42,9 @@ + @click="withdraw"> 提现 - 提现记录 diff --git a/pages_tool/member/balance.vue b/pages_tool/member/balance.vue index ac2a8b7..c601178 100644 --- a/pages_tool/member/balance.vue +++ b/pages_tool/member/balance.vue @@ -5,8 +5,7 @@ + }"> @@ -18,19 +17,18 @@ {{ (parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }} - 账户余额（元） + 账户余额 - {{ balanceInfo.balance_money|moneyFormat }} - 现金余额（元） + {{(parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }} + 余额 - {{ balanceInfo.balance|moneyFormat }} - 储值余额（元） + + - @@ -49,6 +47,9 @@ + + 转账 + {{ $lang('recharge') }} @@ -98,6 +99,9 @@ export default { }, toBalanceDetail() { this.$util.redirectTo('/pages_tool/member/balance_detail'); + }, + toBalanceTransfer() { + this.$util.redirectTo('/pages_tool/member/balance_transfer'); }, toList() { this.$util.redirectTo('/pages_tool/recharge/list'); @@ -111,6 +115,7 @@ export default { }, success: res => { if (res.data) { + console.log(res.data); this.balanceInfo = res.data; } else { this.$util.showToast({ diff --git a/pages_tool/member/balance_transfer.vue b/pages_tool/member/balance_transfer.vue new file mode 100644 index 0000000..e489c31 --- /dev/null +++ b/pages_tool/member/balance_transfer.vue @@ -0,0 +1,353 @@ + + + + diff --git a/pages_tool/member/info.vue b/pages_tool/member/info.vue index d91587b..76a31a2 100644 --- a/pages_tool/member/info.vue +++ b/pages_tool/member/info.vue @@ -66,11 +66,10 @@ - - + 所在地址 {{ memberInfo.full_address }} {{ memberInfo.address }} diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue index c988fa2..aafb5dc 100644 --- a/pages_tool/member/info_edit.vue +++ b/pages_tool/member/info_edit.vue @@ -62,8 +62,8 @@ - - + + 请先绑定手机再执行该操作 @@ -97,11 +97,12 @@ - + + diff --git a/pages_tool/member/public/css/balance.scss b/pages_tool/member/public/css/balance.scss index 1a22de4..a1a1e9c 100644 --- a/pages_tool/member/public/css/balance.scss +++ b/pages_tool/member/public/css/balance.scss @@ -157,4 +157,8 @@ line-height: 72rpx; color: #FF4646; } + .transfer { + background: #4dc36c; + } + } \ No newline at end of file diff --git a/pages_tool/member/public/js/info.js b/pages_tool/member/public/js/info.js index a03cb1b..493e171 100644 --- a/pages_tool/member/public/js/info.js +++ b/pages_tool/member/public/js/info.js @@ -77,18 +77,16 @@ export default { }; }, onLoad(option) { - this.formData.mobileCodeText = this.$lang('findanimateCode'); if (option.back) { this.back = option.back; } this.getCaptcha(); - if (option.action) { this.indent = option.action; + console.log(this.indent); this.setNavbarTitle() } - this.getRegisterConfig(); this.isIphoneX = this.$util.uniappIsIPhoneX() this.initLang(); @@ -172,6 +170,9 @@ export default { case 'mobile': title = this.$lang('mobile'); break; + case 'pay_password': + title = this.$lang('paypassword'); + break; } uni.setNavigationBarTitle({ title: title @@ -199,9 +200,7 @@ export default { this.formData.nickName = this.memberInfo.nickname; //昵称 this.formData.realName = this.memberInfo.realname; //真实姓名 this.formData.sex = this.memberInfo.sex; //性别 - this.formData.birthday = this.memberInfo.birthday ? this.$util.timeStampTurnTime( - this.memberInfo.birthday, - 'YYYY-MM-DD') : ''; //生日 + this.formData.birthday = this.memberInfo.birthday ? this.$util.timeStampTurnTime(this.memberInfo.birthday,'YYYY-MM-DD') : ''; //生日 this.formData.provinceId = this.memberInfo.province_id; this.formData.cityId = this.memberInfo.city_id; this.formData.districtId = this.memberInfo.district_id; @@ -352,7 +351,7 @@ export default { case 'birthday': this.modifyBirthday(); break; - case 'password': + case 'password' || 'pay_password': this.modifyPassword(); break; case 'mobile': @@ -582,7 +581,7 @@ export default { }); }, modifyPassword() { - if (this.memberInfo.password) { + if ((this.indent=='password'&&this.memberInfo.password) || (this.indent=='pay_password'&&this.memberInfo.pay_password)) { var rule = [{ name: 'currentPassword', checkType: 'required', @@ -612,7 +611,6 @@ export default { } ]; } - let regConfig = this.registerConfig; if (regConfig.pwd_len > 0) { rule.push({ @@ -665,6 +663,7 @@ export default { this.$api.sendRequest({ url: '/api/member/modifypassword', data: { + pass_type: this.indent, new_password: this.formData.newPassword, old_password: this.formData.currentPassword, code: this.formData.mobileDynacode,