diff --git a/api/store.js b/api/store.js index 39378dc..27052f8 100644 --- a/api/store.js +++ b/api/store.js @@ -221,3 +221,11 @@ export function getResourceDetail(data) { params: { id: data.id } }) } + +// 资料详情 +export function resourcedownload(data) { + let url = 'resource/downloadLog' + return request.get(url, { + params: { id: data.id } + }) +} \ No newline at end of file diff --git a/bundle/pages/user_wallet/user_wallet.vue b/bundle/pages/user_wallet/user_wallet.vue index 69f9ff1..cd9273c 100644 --- a/bundle/pages/user_wallet/user_wallet.vue +++ b/bundle/pages/user_wallet/user_wallet.vue @@ -113,7 +113,7 @@ slogan: "每日优惠券抢不停", button: "立即抢购", buttonColor: "#FC597A", - href: "/pages/get_coupon/get_coupon", + href: "/bundle/pages/get_coupon/get_coupon", image: "/bundle/static/img_activity_coupon.png", background: "rgba(252, 89, 122, 0.1)" }, diff --git a/components/float-tab/float-tab.vue b/components/float-tab/float-tab.vue index 9e75048..1c1ac43 100644 --- a/components/float-tab/float-tab.vue +++ b/components/float-tab/float-tab.vue @@ -8,10 +8,10 @@ url="/bundle/pages/chat/chat"> - + diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue index d136c91..05b7157 100644 --- a/components/tabbar/tabbar.vue +++ b/components/tabbar/tabbar.vue @@ -29,7 +29,7 @@ iconPath: item.un_selected_icon, selectedIconPath: item.selected_icon, text: item.name, - count: item.page_path == 'pages/shop_cart/shop_cart' ? this.cartNum : 0, + count: item.page_path == '/bundle/pages/shop_cart/shop_cart' ? this.cartNum : 0, pagePath: '/' + item.page_path } }) diff --git a/config/app.js b/config/app.js index 3447ba0..5263ce0 100644 --- a/config/app.js +++ b/config/app.js @@ -17,9 +17,9 @@ const IS_H5 = false /** S API BaseURL **/ const baseURLMap = { // 开发环境 - development: 'http://loca.ahbcqz.com', + development: 'https://www.ahbcqz.com', // 生产环境 - production: IS_H5 ? location.origin : 'http://loca.ahbcqz.com/', + production: IS_H5 ? location.origin : 'https://www.ahbcqz.com', } const baseURL = SWITCH_DEVELOPMENT ? baseURLMap['development'] : baseURLMap[process.env.NODE_ENV] diff --git a/manifest.json b/manifest.json index 403be86..bfb068b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { - "name" : "安徽博创起重", - "appid" : "__UNI__E7C0D34", + "name" : "博创起重设备交流咨询设计", + "appid" : "__UNI__6900FB8", "description" : "", "versionName" : "2.2.41", "versionCode" : 106, @@ -127,11 +127,12 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx6edabb8bae33d128", + "appid" : "wx57436b5dd00aa36d", "setting" : { "urlCheck" : false, "minified" : true, - "postcss" : true + "postcss" : false, + "es6" : false }, "usingComponents" : true, "optimization" : { @@ -142,6 +143,7 @@ "desc" : "你的位置信息将用于小程序位置接口的效果展示" } }, + "lazyCodeLoading" : "requiredComponents", "requiredPrivateInfos" : [ "getLocation", "chooseAddress", "onLocationChange" ] }, "mp-alipay" : { diff --git a/pages.json b/pages.json index 5b4eb23..e8fdade 100644 --- a/pages.json +++ b/pages.json @@ -15,53 +15,6 @@ "bounce": "none" } } - }, - { - "path": "pages/user/complain", - "name": "complain", - "meta": { - "auth": false, - "keepScroll": true - }, - "style": { - "navigationBarTitleText": "用户投诉", - "disableScroll": true - } - }, - { - "path": "pages/user/complain_recode", - "name": "complain_recode", - "meta": { - "auth": false, - "keepScroll": true - }, - "style": { - "navigationBarTitleText": "用户投诉记录", - "disableScroll": true - } - },{ - "path": "pages/user/complain_result", - "name": "complain_result", - "meta": { - "auth": false, - "keepScroll": true - }, - "style": { - "navigationBarTitleText": "用户投诉结果", - "disableScroll": true - } - }, - { - "path": "pages/user/vip", - "name": "user_vip", - "meta": { - "auth": false, - "keepScroll": true - }, - "style": { - "navigationBarTitleText": "vip用户", - "disableScroll": true - } }, { "path": "pages/goods_cate/goods_cate", "name": "goods_cate", @@ -107,38 +60,6 @@ "navigationBarTitleText": "专家机构详情" } }, - { - "path": "pages/shop_cart/shop_cart", - "name": "shop_cart", - "meta": { - "auth": false, - "keepScroll": true - }, - "style": { - "navigationBarTitleText": "购物车" - } - }, - { - "path": "pages/resource_list/resource_list", - "name": "resource_list", - "meta": { - "auth": false, - "keepScroll": true - }, - "style": { - "navigationBarTitleText": "资料库" - } - },{ - "path": "pages/resource_details/resource_details", - "name": "resource_details", - "meta": { - "auth": false, - "keepScroll": true - }, - "style": { - "navigationBarTitleText": "资料详情" - } - }, { "path": "pages/user/user", @@ -162,15 +83,7 @@ "navigationBarTitleText": "登录" } }, - { - "path": "pages/register/register", - "meta": { - "auth": false - }, - "style": { - "navigationBarTitleText": "注册账号" - } - }, + { "path": "pages/goods_details/goods_details", "meta": { @@ -181,15 +94,7 @@ "navigationBarTitleText": "商品详情" } }, - { - "path": "pages/forget_pwd/forget_pwd", - "meta": { - "auth": false - }, - "style": { - "navigationBarTitleText": "忘记密码" - } - }, + { "path": "pages/confirm_order/confirm_order", "meta": { @@ -256,15 +161,7 @@ "navigationBarTitleText": "" } }, - { - "path": "pages/get_coupon/get_coupon", - "meta": { - "auth": true - }, - "style": { - "navigationBarTitleText": "领券中心" - } - }, + { "path": "pages/active_list/active_list", "meta": { @@ -323,8 +220,18 @@ "navigationBarTitleText": "头像裁剪", "navigationBarBackgroundColor": "#000000" } + }, + { + "path": "pages/resource_list/resource_list", + "name": "resource_list", + "meta": { + "auth": false, + "keepScroll": true + }, + "style": { + "navigationBarTitleText": "资料库" + } } - ], // "plugins": { @@ -338,6 +245,103 @@ "root": "bundle", "pages": [ { + "path": "pages/forget_pwd/forget_pwd", + "meta": { + "auth": false + }, + "style": { + "navigationBarTitleText": "忘记密码" + } + }, + { + "path": "pages/get_coupon/get_coupon", + "meta": { + "auth": true + }, + "style": { + "navigationBarTitleText": "领券中心" + } + }, + { + "path": "pages/resource_details/resource_details", + "name": "resource_details", + "meta": { + "auth": false, + "keepScroll": true + }, + "style": { + "navigationBarTitleText": "资料详情" + } + }, + { + "path": "pages/register/register", + "meta": { + "auth": false + }, + "style": { + "navigationBarTitleText": "注册账号" + } + }, + { + "path": "pages/shop_cart/shop_cart", + "name": "shop_cart", + "meta": { + "auth": false, + "keepScroll": true + }, + "style": { + "navigationBarTitleText": "购物车" + } + }, + { + "path": "pages/user/complain", + "name": "complain", + "meta": { + "auth": false, + "keepScroll": true + }, + "style": { + "navigationBarTitleText": "用户投诉", + "disableScroll": true + } + }, + { + "path": "pages/user/complain_recode", + "name": "complain_recode", + "meta": { + "auth": false, + "keepScroll": true + }, + "style": { + "navigationBarTitleText": "用户投诉记录", + "disableScroll": true + } + },{ + "path": "pages/user/complain_result", + "name": "complain_result", + "meta": { + "auth": false, + "keepScroll": true + }, + "style": { + "navigationBarTitleText": "用户投诉结果", + "disableScroll": true + } + }, + { + "path": "pages/user/vip", + "name": "user_vip", + "meta": { + "auth": false, + "keepScroll": true + }, + "style": { + "navigationBarTitleText": "vip用户", + "disableScroll": true + } + }, + + { "path": "pages/all_comments/all_comments", "meta": { "auth": false diff --git a/pages/community/community.vue b/pages/community/community.vue index ce35560..243c0a1 100644 --- a/pages/community/community.vue +++ b/pages/community/community.vue @@ -25,12 +25,12 @@ - - diff --git a/pages/community/components/follow.vue b/pages/community/components/follow.vue deleted file mode 100644 index b9b7dce..0000000 --- a/pages/community/components/follow.vue +++ /dev/null @@ -1,413 +0,0 @@ - - - - - - - - - - - - - - {{ item.user.nickname }} - - - {{ item.create_time }} - - - - - - - - - - - 查看TA提到的服务({{item.goods_data.length}}) - - - - - - - - - - - - 查看TA提到的商家({{item.shop_data.length}}) - - - - - - - - - - - - - {{ item.beforeContent }}... - 展开 - - - {{ item.content }} - - - - # {{ item.topic.name }} - - - - - - - - - - - - - - - - {{ item.like }} - - - - {{ item.comment }} - - - - - - - - - - - - - - - - - - - - - - - - 立即分享给好友吧 - 点击屏幕右上角将本页面分享给好友 - - - - - - - - - - diff --git a/pages/community/components/like-header.vue b/pages/community/components/like-header.vue deleted file mode 100644 index 0532eb6..0000000 --- a/pages/community/components/like-header.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - 关注 - - - - 服务 - - - - 需求 - - - - 机构 - - - - 专家 - - - - - - - - - - - - - - - - - diff --git a/pages/community/components/lists.vue b/pages/community/components/lists.vue deleted file mode 100644 index 74d64aa..0000000 --- a/pages/community/components/lists.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/pages/forget_pwd/forget_pwd.vue b/pages/forget_pwd/forget_pwd.vue deleted file mode 100644 index 6169a79..0000000 --- a/pages/forget_pwd/forget_pwd.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - - - 手机号 - - - - 短信验证码 - - - - - - {{codeTips}} - - - - 重置密码 - - - - 确认密码 - - - - - 确认 - - - - - - - diff --git a/pages/get_coupon/get_coupon.vue b/pages/get_coupon/get_coupon.vue deleted file mode 100644 index f6a88de..0000000 --- a/pages/get_coupon/get_coupon.vue +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/pages/login/login.vue b/pages/login/login.vue index 5f1ceae..fc6e57c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -58,7 +58,7 @@ /> 忘记密码 @@ -112,7 +112,7 @@ }} 注册账号 diff --git a/pages/pay_result/pay_result.vue b/pages/pay_result/pay_result.vue index 04c44ad..37ff65c 100644 --- a/pages/pay_result/pay_result.vue +++ b/pages/pay_result/pay_result.vue @@ -86,12 +86,12 @@ if(this.type == 1 ){ this.showBtn = '查看会员' - return '/pages/user/vip' + return '/bundle/pages/user/vip' } if(this.type == 2 && this.org_id>0){ this.showBtn = '前往下载' console.log(this.showBtn) - return '/pages/resource_details/resource_details?id='+this.org_id + return '/bundle/pages/resource_details/resource_details?id='+this.org_id } switch(this.from) { diff --git a/pages/payment/payment.vue b/pages/payment/payment.vue index 4a278e0..e6411ae 100644 --- a/pages/payment/payment.vue +++ b/pages/payment/payment.vue @@ -102,6 +102,7 @@ methods: { // 更改支付方式 changePayway(value) { + console.log(value) this.$set(this, 'payway', value) }, @@ -130,6 +131,7 @@ // 预支付处理 handlePrepay() { + console.log("payway:",this.payway) if (this.loadingPay) return this.loadingPay = true prepay({ diff --git a/pages/register/register.vue b/pages/register/register.vue deleted file mode 100644 index 0875d99..0000000 --- a/pages/register/register.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - 手机号 - - - - 短信验证码 - - - - - - {{codeTips}} - - - - 设置密码 - - - - 确认密码 - - - - - 立即注册 - - - - - 已阅读并同意 - - 《服务协议》 - - 和 - - 《隐私协议》 - - - - - - - - - - - diff --git a/pages/resource_details/resource_details.vue b/pages/resource_details/resource_details.vue deleted file mode 100644 index fe50d00..0000000 --- a/pages/resource_details/resource_details.vue +++ /dev/null @@ -1,769 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - {{resourceDetail.price_str}} - - - - - - - {{ resourceDetail.title }} - - - 区域: {{ resourceDetail.address }} - 下载量: {{ resourceDetail.download }} - 浏览量: {{ resourceDetail.visit }} - - - - - - - - - - 资料简介 - - - - - - - - {{ btnText.red }} - - - - - - - - 该资料已经去星球外啦,去看看别的吧~ - - - - - - - - - - - -team_min_price - - - diff --git a/pages/resource_details1/resource_details1.vue b/pages/resource_details1/resource_details1.vue deleted file mode 100644 index e75e153..0000000 --- a/pages/resource_details1/resource_details1.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - - {{ articleDetail.title }} - - 发布时间:{{ articleDetail.create_time }} - - - {{ articleDetail.download }}人下载 - - - - - - - - - - - - - \ No newline at end of file diff --git a/pages/resource_list/resource_list.vue b/pages/resource_list/resource_list.vue index e04ebf4..d869cad 100644 --- a/pages/resource_list/resource_list.vue +++ b/pages/resource_list/resource_list.vue @@ -22,7 +22,7 @@ - + {{ item.title }} diff --git a/pages/shop_cart/shop_cart.vue b/pages/shop_cart/shop_cart.vue deleted file mode 100644 index d3b564a..0000000 --- a/pages/shop_cart/shop_cart.vue +++ /dev/null @@ -1,416 +0,0 @@ - - - - - - - - - - 该店铺未开启支付功能 - - - - - - - - - - - 已失效 - - - - {{item.goods_name}} - - {{item.spec_value_str}} - - - - - - - - - - - - - - - - - - - - - 购物车暂无任何商品~ - - 去逛逛 - - - - - 登录后才能查看购物车哦 - - - - 去登录 - - - - - - - - - 全选 - - 删除 - - 合计: - ¥{{totalPrice || 0}} - - 去结算 - - - - - 确认删除选中商品吗? - - - - - - - - diff --git a/pages/user/complain.vue b/pages/user/complain.vue deleted file mode 100644 index da92dd6..0000000 --- a/pages/user/complain.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 支持jpg、png、jpeg格式的图片,最多可上传10张 - - - 备注说明 - - - - - - - - 投诉 - - - - - - - 查看提交记录 - - - - - - - - - - - diff --git a/pages/user/complain_recode.vue b/pages/user/complain_recode.vue deleted file mode 100644 index 97a009c..0000000 --- a/pages/user/complain_recode.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - {{item.content}} - - - - 提交时间:{{item.create_time}} - - - - - 处理状态: - {{item.is_complate==1?'已处理':'未处理'}} - - 查看 - - - - - - - - - - - - diff --git a/pages/user/complain_result.vue b/pages/user/complain_result.vue deleted file mode 100644 index 8b25fb9..0000000 --- a/pages/user/complain_result.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - {{getStatus.text}} - - {{getStatus.desc}} - - - 返回首页 - - - - - - - - - - - 投诉类型 - {{applyDetail.category}} - - - - - - 投诉截图 - - - - - - - - - - 投诉内容 - {{applyDetail.content}} - - - - - - 处理结果 - {{applyDetail.remark?applyDetail.remark:'--'}} - - - - - - - - - - - diff --git a/pages/user/user.vue b/pages/user/user.vue index 2cfa58d..d744930 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -93,7 +93,7 @@ 会员可享多项权益 - + {{ userInfo.overdue_time ? '立即续费' : '立即激活' }} diff --git a/pages/user/vip.vue b/pages/user/vip.vue deleted file mode 100644 index 928c912..0000000 --- a/pages/user/vip.vue +++ /dev/null @@ -1,918 +0,0 @@ - - - - - - - {{userInfo.nickname || ''}} - 永久SVIP会员 - SVIP会员 {{userInfo.overdue_time }}到期 - - - - - 开通即享会员权益 - - {{userInfo.vip_status==3 ? '续费会员' : '开通会员'}} - - - - - - SVIP会员尊享权 - - - - - - - {{item.title}} - {{item.explain}} - - - - - - - {{userInfo.vip_status==3 ? '续费会员' : '开通会员'}} - 有效期至{{memberEndTime}} - - - - {{item.title}} - ¥{{item.pre_price | moneyFormat}} - 试用{{item.vip_day}}天 - ¥{{item.price | moneyFormat}} - - - - 购买即视为同意《会员用户协议》 - - {{ type=== 'free'? '立即试用' : '立即支付'}} - - - - - - - - - - - - diff --git a/static/images/banner_coupon.jpg b/static/images/banner_coupon.jpg index ca0e448..de01afb 100644 Binary files a/static/images/banner_coupon.jpg and b/static/images/banner_coupon.jpg differ diff --git a/static/images/icon_success.png b/static/images/icon_success.png index 2a625fc..829afb5 100644 Binary files a/static/images/icon_success.png and b/static/images/icon_success.png differ diff --git a/static/images/index_bg.png b/static/images/index_bg.png index 789891d..1b07fdd 100644 Binary files a/static/images/index_bg.png and b/static/images/index_bg.png differ diff --git a/static/images/likes.png b/static/images/likes.png index cd796e4..820969f 100644 Binary files a/static/images/likes.png and b/static/images/likes.png differ diff --git a/static/images/loading.gif b/static/images/loading.gif index 3535ac3..d341d32 100644 Binary files a/static/images/loading.gif and b/static/images/loading.gif differ diff --git a/static/images/pintuan_bg.png b/static/images/pintuan_bg.png index e509b32..2e2d485 100644 Binary files a/static/images/pintuan_bg.png and b/static/images/pintuan_bg.png differ