diff --git a/api/api.js b/api/api.js index 80e20dd..90651be 100644 --- a/api/api.js +++ b/api/api.js @@ -107,6 +107,14 @@ export function getArticleBannerList(){ export function getArticleDetails(id){ return request.get('article/detail/'+id,{},{noAuth:true}); } +/** + * 分享文章 + * @param int id + * +*/ +export function shareArticle(type){ + return request.get('user/brand',{type:3},{noAuth:true}); +} /** * 手机号+验证码登录接口 * @param object data diff --git a/api/store.js b/api/store.js index c155b3a..84128ee 100644 --- a/api/store.js +++ b/api/store.js @@ -18,6 +18,16 @@ export function getProductDetail(id) { noAuth: true }); } +/** + * 获取付款配置 + * @param int id + * + */ +export function getPayConfig(id) { + return request.get('user/getPayConfig', {id:id}, { + noAuth: true + }); +} /** * 获取预览商品详情 * @param int id @@ -83,6 +93,21 @@ export function getProductslist(data) { noAuth: true }); } +/** + * 获取三区商品列表 + * @param object data + */ +export function getArealist(data) { + if (data.brand_id && Array.isArray(data.brand_id)) { + data = { + ...data + } + data.brand_id = data.brand_id.toString() + } + return request.get('user/getAreaList', data, { + noAuth: true + }); +} /** * 获取优惠券商品列表 * @param object data diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index a9fc3b5..662a803 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -73,7 +73,7 @@ 退款中 x {{item.product_num - item.refund_num}} 已退款 x {{item.product_num - item.refund_num}} - 申请退款 + 申请退款 去评价 已评价 @@ -145,9 +145,10 @@ } }, onShow() { - this.isPayBalance() + this.isPayBalance(); + }, + mounted() { }, - mounted() {}, methods: { evaluateTap:function(unique,orderId){ uni.navigateTo({ diff --git a/config/app.js b/config/app.js index c9b6183..63862ab 100644 --- a/config/app.js +++ b/config/app.js @@ -6,11 +6,12 @@ let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' //测试 -let httpApi = 'https://mer.crmeb.net' //生产 +// let httpApi = 'https://mer.crmeb.net' //生产 +let httpApi = 'https://b2b2c.njrenzhou.cn' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net // let wsApi = 'ws://192.168.3.20:8324' -let wsApi = 'wss://mer.crmeb.net' +let wsApi = 'wss://b2b2c.njrenzhou.cn' module.exports = { // 请求域名 格式： https://您的域名 diff --git a/libs/wechat.js b/libs/wechat.js index 75eba52..c7bcf1f 100644 --- a/libs/wechat.js +++ b/libs/wechat.js @@ -291,4 +291,4 @@ class AuthWechat { } export default new AuthWechat(); -// #endif +// #endif \ No newline at end of file diff --git a/manifest.json b/manifest.json index 6a30c8c..90702ac 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "CRMEB", - "appid" : "__UNI__99FC347", + "appid" : "__UNI__6105009", "description" : "", "versionName" : "1.0.4", "versionCode" : 127, @@ -188,7 +188,7 @@ }, "router" : { "mode" : "history", - "base" : "" + "base" : "./" }, "domain" : "", "sdkConfigs" : { @@ -198,7 +198,7 @@ } } }, - "title" : "加载中...", + "title" : "小易", "template" : "template.h5.html" } } diff --git a/pages.json b/pages.json index 1dc0acd..31fadf6 100644 --- a/pages.json +++ b/pages.json @@ -51,13 +51,13 @@ { "path": "pages/news_list/index", "style": { - "navigationBarTitleText": "资讯" + "navigationBarTitleText": "品宣" } }, { "path": "pages/news_details/index", "style": { - "navigationBarTitleText": "资讯详情" + "navigationBarTitleText": "详情" } }, { @@ -824,6 +824,12 @@ "navigationBarTitleText": "商品列表" } }, + { + "path": "goods_area_list/index", + "style": { + "navigationBarTitleText": "三区商品列表" + } + }, { "path": "goods_coupon_list/index", "style": { @@ -1129,10 +1135,10 @@ "text": "分类" }, { - "pagePath": "pages/plant_grass/index", + "pagePath": "pages/news_list/index", "iconPath": "static/images/5-001.png", "selectedIconPath": "static/images/5-002.png", - "text": "逛逛" + "text": "品宣" }, { "pagePath": "pages/order_addcart/order_addcart", diff --git a/pages/columnGoods/goods_area_list/index.vue b/pages/columnGoods/goods_area_list/index.vue new file mode 100644 index 0000000..275e6b8 --- /dev/null +++ b/pages/columnGoods/goods_area_list/index.vue @@ -0,0 +1,979 @@ + + + + diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 8adc3a7..8b28904 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -392,6 +392,7 @@ import { arrivalSubscribe } from '@/utils/SubscribeMessage.js'; import { getProductDetail, + getPayConfig, getProductCode, collectAdd, collectDel, @@ -545,6 +546,8 @@ show: false, params: [] }, + pay_type:4, + pay_image:[], }; }, computed:{ @@ -602,6 +605,7 @@ // #endif shareScence(that.currSpid, that.isLogin) this.getGoodsDetails(); + this.getPayConfigs(); this.getDiscountsData(); //#ifdef H5 this.isLogin && silenceBindingSpread(); @@ -1012,6 +1016,25 @@ }); }) }, + getPayConfigs:function(){ + let that = this; + getPayConfig(that.id).then(res => { + uni.hideLoading(); + this.pay_type = res.data.pay_type; + this.pay_image = res.data.pay_image; + uni.setStorageSync('pay_type',this.pay_type); + uni.setStorageSync('pay_image_1',this.pay_image[0]); + uni.setStorageSync('pay_image_2',this.pay_image[1]); + }).catch(err => { + //状态异常返回上级页面 + return that.$util.Tips({ + title: err + }, { + tab: 3, + url: 1 + }); + }) + }, infoScroll: function() { var that = this, topArr = [], diff --git a/pages/news_details/index.vue b/pages/news_details/index.vue index cfd8efa..488846b 100644 --- a/pages/news_details/index.vue +++ b/pages/news_details/index.vue @@ -48,7 +48,7 @@ // +---------------------------------------------------------------------- import parser from "@/components/jyf-parser/jyf-parser"; import { - getArticleDetails + getArticleDetails,shareArticle } from '@/api/api.js'; import shareInfo from '@/components/shareInfo'; import home from '@/components/home'; @@ -86,6 +86,7 @@ history.back(); // #endif } + shareArticle() }, onShow: function() { this.getArticleOne(); @@ -119,9 +120,14 @@ desc: this.articleInfo.synopsis, title: this.articleInfo.title, link: href, - imgUrl: this.articleInfo.image_input + imgUrl: this.articleInfo.image_input, + success: function() { + // 在这里调用 shareArticle 方法 + this.shareArticle(this.articleInfo.id); + } }; this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], configAppMessage); + } } } diff --git a/pages/news_list/index.vue b/pages/news_list/index.vue index 02c4887..13eab91 100644 --- a/pages/news_list/index.vue +++ b/pages/news_list/index.vue @@ -26,13 +26,13 @@ + + + {{item.title}} {{item.create_time}} - - - @@ -227,6 +227,7 @@ text-overflow: ellipsis; position: relative; padding-bottom: 20rpx; + text-align: center; } .newsList .nav .item.on { color: #282828; @@ -244,14 +245,23 @@ left: 50%; margin-left: -12rpx; } + .newsList .list .row-between-wrapper{ + display: flex; + } .newsList .list .item { margin: 0 30rpx; border-bottom: 1px solid #f0f0f0; padding: 35rpx 0; } + .row-column-between{ + display: block; + } + .line2{ + margin: 10px 0; + } .newsList .list .item .pictrue { - width: 250rpx; - height: 156rpx; + width: 100%; + height: 420rpx; } .newsList .list .item .pictrue image { width: 100%; @@ -260,7 +270,7 @@ } .newsList .list .item .text { width: 420rpx; - height: 156rpx; + // height: 156rpx; font-size: 24rpx; color: #999; } diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 7ef46dd..f04e876 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -250,13 +250,13 @@ 确认收货 - 批量退款 + 查看物流 再次购买 删除订单 - 批量退款 + 再次购买 diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue index af9c930..0402e40 100644 --- a/pages/order_pay_status/index.vue +++ b/pages/order_pay_status/index.vue @@ -12,12 +12,12 @@ 下单时间 {{order_pay_info.create_time}} - + 支付金额 {{order_pay_info.pay_price}} diff --git a/pages/user/index.vue b/pages/user/index.vue index 9c3a0be..cb33a75 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -188,10 +188,6 @@ {{copyright.Copyright}} - - - 众邦科技提供技术支持 - @@ -317,8 +313,9 @@ {pic: '',name: '',isShow: true}, {pic: '',name: '',isShow: true}, {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true} + // {pic: '',name: '',isShow: true}, + // {pic: '',name: '',isShow: true}, + // {pic: '',name: '',isShow: true}, ], autoplay: true, circular: true, @@ -549,6 +546,7 @@ that.personalMenu.push(item) }) that.imgUrls = res.data.banner + console.log(that.personalMenu); }); }, // 编辑页面 diff --git a/pages/users/feedback/index.vue b/pages/users/feedback/index.vue index 30b846e..7d50d9a 100644 --- a/pages/users/feedback/index.vue +++ b/pages/users/feedback/index.vue @@ -179,6 +179,7 @@ console.log(res, '回调') that.uploadImg.push(res.data.path); that.$set(that, 'uploadImg', that.uploadImg); + console.log(that.uploadImg); }); }, // 弹窗关闭 diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index e25b025..0114835 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -273,7 +273,34 @@ - + + + 支付方式 + + + + + + + + + + + 支付凭证 + + + + + + + + + + + + + + 支付方式 @@ -310,7 +337,7 @@ - + @@ -613,6 +640,11 @@ order_key: '', is_take: '', domain: HTTP_REQUEST_URL, + pay_types:'', + pay_image_1:[], + pay_image_2:[], + isUpload:true, + uploadImg: '', }; }, computed: { @@ -625,7 +657,10 @@ }, yue_pay_status(n){ this.payMode[2].payStatus = n - } + }, + // uploadImg(nVal, oVal) { + // this.isUpload = nVal.length < 6 ? true : false + // } }, onReady() { }, @@ -682,6 +717,9 @@ data:{}, success: function(){} }) + this.pay_types = uni.getStorageSync('pay_type'); + this.pay_image_1 = uni.getStorageSync('pay_image_1'); + this.pay_image_2 = uni.getStorageSync('pay_image_2'); }, /** * 生命周期函数--监听页面显示 @@ -751,6 +789,19 @@ }); } }, + /**上传凭证*/ + uploadpics: function(item) { + let that = this; + that.$util.uploadImageOne('upload/image', function(res) { + that.uploadImg = res.data.path; + that.isUpload = false; + }); + }, + /** 删除凭证*/ + deleteImg: function() { + this.uploadImg = ''; + this.isUpload = true; + }, /**上传文件*/ uploadpic: function(item) { let that = this; @@ -758,6 +809,7 @@ let pics = item.value || [] pics.push(res.data.path); that.$set(item,'value', pics); + console.log(pics); }); }, /** 删除图片*/ @@ -1467,11 +1519,19 @@ }); } } + if(that.pay_types == 1){ + if(!that.uploadImg){ + return that.$util.Tips({ + title: '请上传支付凭证' + }); + } + } data = { cart_id: this.cartId.split(","), address_id: this.addressId, use_coupon: this.subCoupon, - pay_type: this.payType, + // pay_type: this.payType, + pay_type: 'balance', mark: this.msgObj, order_type: this.order_type, key: this.order_key, @@ -1480,6 +1540,8 @@ receipt_data: this.invoiceData, extend: this.extend, post: this.post, + pay_type_2: this.pay_types, + pay_image: this.uploadImg, // #ifdef H5 return_url: 'http://' + window.location.host + '/pages/users/order_list/index', // #endif @@ -2331,4 +2393,194 @@ height: 756rpx; overflow-y: scroll; } + + .offline{ + .img-wrap{ + .img-box{ + display:flex; + // width:50%; + // margin:10rpx; + image{ + max-width: 100%; + height: 320rpx; + margin:10rpx; + } + } + } + } + + .item-box { + margin-bottom: 10rpx; + padding: 0 30px; + .title-box { + font-size: 28rpx; + color: #222222; + + text { + margin-right: 10rpx; + color: var(--view-theme); + } + + .des { + margin-left: 10rpx; + font-size: 22rpx; + color: #999999; + } + } + + .tab-box { + margin-top: 20rpx; + display: flex; + flex-wrap: wrap; + + .tab-item { + // overflow: hidden; + // display: -webkit-box; + line-height: 66rpx; + align-items: center; + justify-content: center; + width: 200rpx; + // height: 66rpx; + margin-right: 20rpx; + margin-bottom: 20rpx; + border: 1px solid #BFBFBF; + border-radius: 33px; + font-size: 28rpx; + text-align: center; + + &.active { + background: var(--view-theme); + color: #fff; + border-color: var(--view-theme); + } + } + } + + .picker { + margin-top: 30rpx; + + .picker-box { + position: relative; + width: 100%; + height: 90rpx; + line-height: 90rpx; + padding: 0 30rpx; + background-color: #F5F5F5; + border-radius: 10rpx; + + .iconfont { + position: absolute; + right: 30rpx; + top: 50%; + transform: translateY(-50%); + font-size: 22rpx; + color: var(--view-theme); + } + } + } + + .textarea-box { + background: #F5F5F5; + border-radius: 10rpx; + + textarea { + width: 100%; + height: 300rpx; + margin-top: 30rpx; + padding: 20rpx 20rpx 0; + font-size: 28rpx; + line-height: 1.5; + + } + + .num { + color: #999; + text-align: right; + padding: 20rpx; + } + } + + .upload-img { + display: flex; + flex-wrap: wrap; + + .img-wrapper { + position: relative; + display: flex; + flex-wrap: wrap; + margin: 30rpx 20rpx 20rpx 0; + width: 158rpx; + height: 158rpx; + + image { + width: 158rpx; + height: 158rpx; + } + + .iconfont { + position: absolute; + right: -15rpx; + top: -20rpx; + font-size: 40rpx; + color: var(--view-theme); + } + + &:nth-child(4n) { + margin-right: 0; + } + } + + .add-img { + display: flex; + align-items: center; + justify-content: center; + width: 250rpx; + height: 250rpx; + background: #F5F5F5; + border-radius: 10rpx; + // margin-top: 30rpx; + margin-bottom: 20rpx; + + .iconfont { + color: #B5B5B5; + font-size: 55rpx; + } + } + } + + .input-box { + input { + display: block; + width: 100%; + height: 90rpx; + margin-top: 20rpx; + padding-left: 20rpx; + background: #f5f5f5; + border-radius: 10rpx; + font-size: 28rpx; + } + } + + .sub-btn { + height: 90rpx; + line-height: 90rpx; + background: var(--view-theme); + color: #fff; + font-size: 32rpx; + text-align: center; + border-radius: 45rpx; + } + + .link { + display: flex; + align-items: center; + justify-content: center; + margin-top: 20rpx; + + .iconfont { + margin-top: 6rpx; + font-size: 22rpx; + } + } + } diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 6dbd57d..3842168 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -217,18 +217,18 @@ 确认收货 - + 去评价 查看详情 - + 再次购买 diff --git a/vue.config.js b/vue.config.js index 3612e93..e831f50 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,4 +8,9 @@ module.exports = { config.optimization.minimizer[0].options.terserOptions.compress.pure_funcs = ['console.log'] } } + // derServer:{ + // port:80, + // host:0.0.0.0, + // disableHostCheck:true, + // } }