master
santaner 12 months ago
parent e30d3f1ac9
commit c2e4bc78ed
  1. 8
      api/api.js
  2. 25
      api/store.js
  3. 7
      components/orderGoods/index.vue
  4. 5
      config/app.js
  5. 2
      libs/wechat.js
  6. 6
      manifest.json
  7. 14
      pages.json
  8. 979
      pages/columnGoods/goods_area_list/index.vue
  9. 23
      pages/goods_details/index.vue
  10. 10
      pages/news_details/index.vue
  11. 22
      pages/news_list/index.vue
  12. 4
      pages/order_details/index.vue
  13. 4
      pages/order_pay_status/index.vue
  14. 10
      pages/user/index.vue
  15. 1
      pages/users/feedback/index.vue
  16. 260
      pages/users/order_confirm/index.vue
  17. 8
      pages/users/order_list/index.vue
  18. 5
      vue.config.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

@ -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

@ -73,7 +73,7 @@
<view class="right-btn-box">
<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
<view class="btn-item" v-if="item.is_refund ==0 && evaluate!=9 && orderData.refund_status || item.refund_num > 0" @click.stop="refund(item)">申请退款</view>
<view class="btn-item" v-if="(item.is_refund ==0 && evaluate!=9 && orderData.refund_status || item.refund_num > 0) && evaluate!=2 && evaluate!=3" @click.stop="refund(item)">申请退款</view>
<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
</view>
@ -145,9 +145,10 @@
}
},
onShow() {
this.isPayBalance()
this.isPayBalance();
},
mounted() {
},
mounted() {},
methods: {
evaluateTap:function(unique,orderId){
uni.navigateTo({

@ -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://您的域名

@ -291,4 +291,4 @@ class AuthWechat {
}
export default new AuthWechat();
// #endif
// #endif

@ -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"
}
}

@ -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",

@ -0,0 +1,979 @@
<template>
<view :style="viewColor">
<view class='productList'>
<view class='search acea-row row-between-wrapper'>
<!--#ifdef H5-->
<view class="back" @click='set_where(1)'>
<view class="iconfont icon-xiangzuo"></view>
</view>
<!--#endif-->
<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search" :value='where.keyword'
@confirm="searchSubmit"></input>
</view>
<!-- <view style="text-align: right;" class='iconfont' :class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view> -->
</view>
<view class="nav-wrapper">
<view class='nav acea-row row-middle'>
<view class='item' @click="downStatus = !downStatus" :class="{'t-color':downKey>0 && firstKey == 0}">
{{downMenu[downKey].title}}
<text v-if="!downStatus" class="iconfont icon-xiala1 spin"></text>
<text v-else class="iconfont icon-xiala1"></text>
</view>
<view class='item' :class="{'t-color':firstKey == 3}" @click='set_where(3)'>
销量
</view>
<view class='item' :class="{'t-color':firstKey == 2}" @click='set_where(2)'>
价格
<image v-if="price==1" :src="domain+'/static/diy/up'+keyColor+'.png'"></image>
<image v-else-if="price==2" :src="domain+'/static/diy/down'+keyColor+'.png'"></image>
<image v-else src='/static/images/horn.png'></image>
</view>
<!-- down -->
<view class='item' :class="{'t-color':firstKey == 4}" @click='bindRight'>
筛选
<text class="iconfont icon-shaixuan"></text>
</view>
</view>
</view>
<!-- 商品 -->
<block v-if="tabIndex == 1">
<view v-if="is_switch" class='list acea-row row-between-wrapper on'>
<view class='item on' hover-class='none' v-for="(item,index) in productList" :key="index"
@click="godDetail(item)">
<view class='pictrue on'>
<image :src='item.image' class="on"></image>
<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
</view>
<view class='text on'>
<view class='name line1'>
<text class="text_name line2">{{item.store_name}}</text>
</view>
<view class='money on'><text class='num'>{{item.price}}</text></view>
<view class="item_tags">
<!-- <text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red bt-color">{{item.merchant.type_name}}</text>
<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red bt-color">自营</text> -->
<text v-if="item.product_type != 0" :class="'font_bg-red bt-color type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
</view>
<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
<view class="company" v-if="item.merchant" @click.stop="goShop(item.mer_id)">
<text class="line1">{{item.merchant.mer_name}}</text>
<view class="flex">
进店
<text class="iconfont icon-xiangyou"></text>
</view>
</view>
</view>
<!-- 返佣 -->
<block v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)">
<view class="foot-bar on">
最高赚 ¥{{item.max_extension}}
</view>
</block>
</view>
</view>
<view v-else class='list'>
<view>test111</view>
<WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/>
</view>
<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
<view class='pictrue' style="margin: 60rpx auto;">
<image src='/static/images/noCart.png'></image>
<view>暂无商品去看点什么吧</view>
</view>
<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
</view>
</block>
<rightSlider v-if="rightBox" :status="rightBox" :brandList="brandList" @confirm="confirm" @close="close"></rightSlider>
</view>
<view class="down-wrapper" v-if="downStatus">
<view class="bg"></view>
<view class="down-box">
<view class="down-item" v-for="(item,index) in downMenu" :key="item.key" :class="{'on':index == downKey}" @click="bindDown(item,index)">
{{item.title}}
<text v-if="index == downKey" class="iconfont icon-gou"></text>
</view>
</view>
</view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<!-- #ifndef H5 -->
<passwordPopup></passwordPopup>
<!-- #endif -->
</view>
</template>
<script>
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEBCRMEB
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import {
getProductslist,
getProductHot,
getBrandlist,
storeMerchantList,
getArealist
} from '@/api/store.js';
import recommend from '@/components/recommend';
import rightSlider from '@/components/rightSlider.vue'
import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
import {initiateAssistApi} from '@/api/activity.js';
import { configMap } from "@/utils";
import { mapGetters } from "vuex";
// #ifndef H5
import passwordPopup from '@/components/passwordPopup';
// #endif
import authorize from '@/components/Authorize';
import {
goShopDetail
} from '@/libs/order.js'
import { HTTP_REQUEST_URL } from '@/config/app';
const app = getApp();
export default {
computed: configMap({hide_mer_status: 1,recommend_switch: 0}, mapGetters(['uid','isLogin','scrollTop','viewColor','keyColor'])),
components: {
// #ifndef H5
passwordPopup,
// #endif
recommend,
rightSlider,
WaterfallsFlow,
authorize,
},
watch:{
tabIndex(nVal,oVal){
if(nVal == 1){
this.loadend = false;
this.$set(this.where, 'page', 1)
this.get_product_list(true);
}else{
this.downStatus = false
this.storeMerchantList()
}
}
},
data() {
return {
domain: HTTP_REQUEST_URL,
productList: [],
list: [],
is_switch: true,
where: {
type: '',
// cate_pid: '',
// order: '',
// price_on: '',
// price_off: '',
// brand_id: '',
// keyword:'',
page:1,
limit:10
},
price: 0,
stock: 0,
nows: false,
loadend: false,
loading: false,
loadTitle: '加载更多',
title: '',
hostProduct: [],
hotPage: 1,
hotLimit: 10,
hotScroll: false,
//
rightBox: false,
//
brandList: [],
downKey: 0,
downStatus: false,
//
downMenu: [{
title: '综合',
key: 1,
},
{
title: '评分',
key: 2,
},
{
title: '新品',
key: 3,
}
],
//
firstKey:0,
// tab
tabIndex: 1,
//
storeList: [],
sotreParam:{
// keyword:'',
page:1,
limit:10,
// order:''
},
storeKey:0,
storeScroll:true,
isShowAuth: false, //
isAuto: false, //
};
},
//
onPageScroll() {
uni.$emit('scroll');
},
onLoad: function(options) {
this.$set(this.where, 'type', options.type || '');
this.title = options.title || '';
// this.$set(this.where, 'keyword', options.searchValue || '');
this.get_product_list(true);
this.get_host_product();
},
onReady(){
},
mounted: function() {
},
methods: {
//
onLoadFun() {
this.isShowAuth = false
},
//
authColse: function(e) {
this.isShowAuth = e
},
//
goShop(id){
if(this.hide_mer_status != 1){
uni.navigateTo({
url:`/pages/store/home/index?id=${id}`
})
}
},
//
storeMerchantList(){
if(!this.storeScroll) return
storeMerchantList({
keyword:this.where.keyword,
page:this.sotreParam.page,
limit:this.sotreParam.limit,
order:this.sotreParam.order
}).then(res=>{
this.storeScroll = res.data.list.length>=this.sotreParam.limit
this.sotreParam.page+=1
this.storeList =this.storeList.concat(res.data.list)
})
},
//
storeTab(key){
this.storeKey = key
if(key == 0){
this.sotreParam.order = ''
}else if(key == 1){
this.sotreParam.order = 'sales'
}else{
this.sotreParam.order = 'rate'
}
this.sotreParam.page = 1
this.storeScroll = true
this.storeList = []
this.storeMerchantList()
},
//
bindRight(){
this.price = 0;
this.firstKey = 4
this.getBrandlist()
},
//
getBrandlist(){
let temp = []
getBrandlist({
// cate_pid:this.where.cate_pid,
keyword:this.where.keyword
}).then(res=>{
temp = res.data.list.map(item=>{
return {
...item,
check:false
}
})
if(this.where.brand_id.length>0){
this.where.brand_id.forEach((ids,index)=>{
temp.forEach(el=>{
if(ids == el.brand_id){
el.check = true
}
})
})
}
this.brandList = temp
this.rightBox = true
})
},
//
godDetail(item) {
goShopDetail(item, this.uid).then(res => {
if (this.isLogin) {
initiateAssistApi(item.activity_id).then(res => {
let id = res.data.product_assist_set_id;
uni.hideLoading();
uni.navigateTo({
url: '/pages/activity/assist_detail/index?id=' + id
});
}).catch((err) => {
uni.showToast({
title: err,
icon: 'none'
})
});
} else {
this.isAuto = true;
this.isShowAuth = true
}
})
},
//
confirm(data) {
let arr = []
if(data.brandList.length == 0){
this.where.brand_id = ''
}else{
data.brandList.forEach(item =>{
arr.push(item.brand_id)
})
this.where.brand_id =arr
}
this.rightBox = data.status
this.where.price_on = data.price_on
this.where.price_off = data.price_off
this.loadend = false;
this.$set(this.where, 'page', 1)
this.get_product_list(true);
},
//
close() {
this.rightBox = false
},
//
bindDown(item, index) {
this.firstKey = 0
if(index == 0){
this.where.order = ''
}else if(index == 1){
this.where.order = 'rate'
}else if(index == 2){
this.where.order = 'is_new'
}
this.downKey = index
this.downStatus = false
this.loadend = false;
this.$set(this.where, 'page', 1)
this.get_product_list(true);
},
Changswitch: function() {
let that = this;
that.is_switch = !that.is_switch
},
searchSubmit: function(e) {
let that = this;
that.$set(that.where, 'keyword', e.detail.value);
if(this.tabIndex == 1){
that.loadend = false;
that.$set(that.where, 'page', 1)
this.get_product_list(true);
}else{
this.sotreParam.page = 1
this.storeScroll = true
this.storeList = []
this.storeMerchantList()
}
},
/**
* 获取我的推荐
*/
get_host_product: function() {
let that = this;
if (that.hotScroll) return
getProductHot(
that.hotPage,
that.hotLimit,
).then(res => {
that.hotPage++
that.hotScroll = res.data.length < that.hotLimit
that.hostProduct = that.hostProduct.concat(res.data.list)
// that.$set(that, 'hostProduct', res.data)
});
},
//
set_where: function(e) {
switch (e) {
case 1:
// uni.setStorageSync('storeIndex', this.where.cate_pid);
uni.navigateBack()
break
case 2:
this.firstKey = e
if (this.price == 0){
this.price = 1;
this.where.order = 'price_asc'
}else if (this.price == 1){
this.price = 2;
this.where.order = 'price_desc'
}else if (this.price == 2){
this.price = 0;
this.where.order = ''
}
this.$set(this.where, 'page', 1)
this.get_product_list(true);
break;
case 3:
this.price = 0;
this.loadend = false;
this.$set(this.where, 'order', 'sales')
this.$set(this.where, 'page', 1)
this.get_product_list(true);
this.firstKey = e
break;
}
this.loadend = false;
this.$set(this.where, 'page', 1);
this.get_product_list(true);
},
//
get_product_list: function(isPage) {
let that = this;
if (that.loadend) return;
if (that.loading) return;
if (isPage === true) that.$set(that, 'productList', []);
console.log(that.productList);
that.loading = true;
that.loadTitle = '';
getArealist(that.where).then(res => {
// let list = res.data.list;
let list = res.data;
let productList = that.$util.SplitArray(list, that.productList);
let loadend = list.length < that.where.limit;
that.loadend = loadend;
that.loading = false;
that.loadTitle = loadend ? '已全部加载' : '加载更多';
that.$set(that, 'productList', productList);
that.$set(that.where, 'page', that.where.page + 1);
}).catch(err => {
that.loading = false;
that.loadTitle = '加载更多';
});
},
},
onPullDownRefresh() {
},
onReachBottom() {
if(this.tabIndex == 1){
if (this.productList.length > 0) {
this.get_product_list('');
} else {
this.get_host_product();
}
}else{
this.storeMerchantList()
}
},
onPullDownRefresh(){
//
setTimeout(()=>{
const newList = this.productList.reverse();
this.productList = newList;
uni.stopPullDownRefresh();
},500)
}
}
</script>
<style lang="scss">
.productList .search {
width: 100%;
height: 86rpx;
padding: 0 20rpx;
box-sizing: border-box;
position: fixed;
left: 0;
top: 0;
z-index: 9;
background-color: var(--view-theme);
}
.bt-color{
background-color: var(--view-theme);
border:1px solid var(--view-theme);
&.type2{
background-color: #FD6523;
border: 1px solid #FD6523;
}
}
.productList .search .back {
display: flex;
align-items: center;
width: 40rpx;
height: 60rpx;
.iconfont {
color: #fff;
font-size: 36rpx;
}
}
.productList .search .input {
width: 640rpx;
height: 60rpx;
background-color: #fff;
border-radius: 50rpx;
padding: 0 20rpx;
box-sizing: border-box;
}
.productList .search .input input {
flex: 1;
height: 100%;
font-size: 26rpx;
margin-left: 10rpx;
}
.productList .search .input .placeholder {
color: #999;
}
.productList .search .input .iconfont {
font-size: 35rpx;
color: #555;
}
.productList .search .icon-pailie,
.productList .search .icon-tupianpailie {
color: #fff;
width: 62rpx;
font-size: 40rpx;
height: 86rpx;
line-height: 86rpx;
}
.productList .nav-wrapper {
z-index: 9;
position: fixed;
left: 0;
top: 0;
width: 100%;
margin-top: 86rpx;
background-color: $theme-color;
.tab-bar {
display: flex;
align-items: center;
.tab-item {
position: relative;
flex: 1;
display: flex;
justify-content: center;
align-items: center;
padding: 8rpx 0 20rpx;
color: #fff;
font-size: 28rpx;
font-weight: bold;
&::after {
content: ' ';
position: absolute;
left: 50%;
bottom: 18rpx;
width: 30rpx;
height: 3rpx;
background: transparent;
transform: translateX(-50%);
}
&.on {
&::after {
background: #fff;
}
}
}
}
}
.productList .nav {
height: 86rpx;
color: #454545;
font-size: 28rpx;
background-color: #fff;
display: flex;
justify-content: space-between;
padding: 0 28rpx;
}
.productList .nav .item {
display: flex;
align-items: center;
justify-content: center;
flex: 1;
&.t-color{
// color: var(--view-theme);
font-weight: bold;
}
}
.productList .nav .item image {
width: 15rpx;
height: 19rpx;
margin-left: 10rpx;
}
.productList .list {
padding: 0 20rpx;
margin-top: 168rpx;
// min-height: 100vh;
}
.productList .list.on {
background-color: #fff;
border-top: 1px solid #f6f6f6;
}
.noCommodity {
background-color: #fff;
padding-bottom: 30rpx;
}
.spin {
display: block;
transform: rotate(180deg);
font-size: 36rpx;
}
.icon-xiala1 {
margin-top: 6rpx;
}
.icon-shaixuan {
font-size: 30rpx;
margin-left: 10rpx;
}
.down-wrapper {
.bg {
z-index: 8;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, .5);
}
.down-box {
z-index: 8;
position: fixed;
left: 0;
top: 170rpx;
width: 100%;
padding: 0 40rpx 28rpx 74rpx;
background-color: #F8F8F8;
border-radius: 0 0 24rpx 24rpx;
.down-item {
margin-top: 28rpx;
font-size: 24rpx;
color: #454545;
&.on {
color: var(--view-theme);
}
.iconfont{
float: right;
}
}
}
}
.store-wrapper {
margin-top: 240rpx;
border-top: 1px solid #F6F6F6;
.star-box {
display: flex;
align-items: center;
.star {
position: relative;
width: 111rpx;
height: 19rpx;
background: url(~pages/columnGoods/images/star.png);
background-size: 111rpx 19rpx;
}
.star-active {
position: absolute;
left: 0;
top: 0;
width: 111rpx;
height: 19rpx;
overflow: hidden;
background: url(~pages/columnGoods/images/star_active.png);
background-size: 111rpx 19rpx;
}
.num {
color: $theme-color;
font-size: 24rpx;
margin-left: 10rpx;
}
}
.store-item {
margin-bottom: 12rpx;
padding: 40rpx 20rpx;
background-color: #fff;
.head {
display: flex;
align-items: center;
justify-content: space-between;
.left-wrapper {
display: flex;
align-items: center;
.logo {
width: 80rpx;
height: 80rpx;
image {
width: 80rpx;
height: 80rpx;
border-radius: 6rpx;
}
}
.con-box {
margin-left: 20rpx;
.name {
font-size: 30rpx;
color: #333;
font-weight: bold;
}
}
}
.link {
width: 114rpx;
height: 50rpx;
line-height: 50rpx;
background: linear-gradient(-90deg, rgba(246, 122, 56, 1) 0%, rgba(241, 27, 9, 1) 100%);
border-radius: 25rpx;
text-align: center;
color: #fff;
font-size: 24rpx;
}
}
.pic-wrapper {
display: flex;
margin-top: 30rpx;
.pic-item {
position: relative;
width: 226rpx;
height: 226rpx;
margin-right: 16rpx;
image {
width: 226rpx;
height: 226rpx;
border-radius: 16rpx;
}
.price {
position: absolute;
right: 0;
bottom: 0;
height: 36rpx;
padding: 0 10rpx;
line-height: 36rpx;
text-align: center;
background: rgba(0, 0, 0, .5);
border-radius: 16rpx 2rpx 16rpx 2rpx;
color: #fff;
font-size: 24rpx;
text {
font-size: 18rpx;
}
}
&:nth-child(3n) {
margin-right: 0;
}
}
}
}
}
.productList .list .item.on {
width: 100%;
display: flex;
border-bottom: 1px solid #f6f6f6;
padding: 30rpx 0;
margin: 0;
position: relative;
}
.productList .list .item .pictrue.on {
position: relative;
width: 260rpx;
height: 260rpx;
.border-picture {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: center/cover no-repeat;
}
}
.productList .list .item .pictrue image {
width: 260rpx;
height: 260rpx;
border-radius: 20rpx 20rpx 0 0;
}
.productList .list .item .pictrue image.on {
border-radius: 6rpx;
}
.productList .list .item .text {
font-size: 30rpx;
color: #222;
width: 460rpx;
padding: 0 0 0 22rpx;
.name{
height: 80rpx;
}
}
.item_tags{
margin-top: 8rpx;
}
.item_tags .tags_item {
display: inline-block;
font-size: 20rpx;
text-align: center;
border-radius: 5rpx;
padding: 0 4rpx;
line-height: 28rpx;
margin-right: 8rpx;
}
.item_tags .tags_item.ticket{
color: #E93323;
border: 1px solid #E93323;
}
.item_tags .tags_item.delivery{
color: #FF9000;
border: 1px solid #FF9000;
}
.productList .list .item .text .money {
display: flex;
align-items: center;
font-size: 26rpx;
font-weight: bold;
margin-top: 10rpx;
color: var(--view-priceColor);
}
.productList .list .item .text .money .num {
font-size: 34rpx;
}
.productList .distance {
display: flex;
align-items: center;
font-size: 24rpx;
color: #999999;
.icon-xiangyou {
font-size: 24rpx;
line-height: 24rpx;
}
}
.productList .list .item .text .money .ticket-big {
display: flex;
align-items: center;
justify-content: center;
min-width: 163rpx;
height: 28rpx;
margin-left: 10rpx;
background-image: url(~static/images/yh.png);
background-size: 100% 100%;
font-size: 20rpx;
font-weight: normal;
padding: 0 10rpx;
}
.productList .list .item .text .score {
margin-top: 10rpx;
color: #737373;
font-size: 20rpx;
}
.productList .list .item .text .company {
display: flex;
align-items: center;
color: #737373;
font-size: 20rpx;
margin-top: 10rpx;
.name {
display: inline-block;
width: 200rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.flex {
display: flex;
align-items: center;
margin-left: 10rpx;
color: #282828;
.iconfont {
font-size: 16rpx;
margin-top: 4rpx;
}
}
}
.productList .list .item .foot-bar {
width: 100%;
height: 52rpx;
display: flex;
align-items: center;
justify-content: center;
background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
border-radius: 0px 0px 16rpx 16rpx;
color: #fff;
font-size: 24rpx;
.icon-fenxiang {
font-size: 24rpx;
margin-right: 10rpx;
}
&.on {
position: absolute;
right: 0;
bottom: 30rpx;
width: 180rpx;
height: 44rpx;
border-radius: 22rpx;
}
}
</style>

@ -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 = [],

@ -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);
}
}
}

@ -26,13 +26,13 @@
<view class='list'>
<block v-for="(item,index) in articleList" :key="index">
<navigator :url='"/pages/news_details/index?id="+item.article_id' hover-class='none' class='item acea-row row-between-wrapper'>
<view class='pictrue'>
<image :src='item.image_input'></image>
</view>
<view class='text acea-row row-column-between'>
<view class='name line2'>{{item.title}}</view>
<view>{{item.create_time}}</view>
</view>
<view class='pictrue'>
<image :src='item.image_input'></image>
</view>
</navigator>
</block>
</view>
@ -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;
}

@ -250,13 +250,13 @@
<view class='bnt b-color' @tap='confirmOrder'>确认收货</view>
</block>
<block v-if="orderInfo.status == 2">
<view class="bnt cancel" @click="allRefund" v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
<!-- <view class="bnt cancel" @click="allRefund" v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view> -->
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel' hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流</navigator>
<view class='bnt b-color' @click="goOrderConfirm" v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 &&orderInfo.activity_type!=4 && orderInfo.activity_type!=10">再次购买</view>
</block>
<block v-if="orderInfo.status == 3">
<view class='bnt cancel' @click="delOrder">删除订单</view>
<view class="bnt cancel" @click="allRefund" v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
<!-- <view class="bnt cancel" @click="allRefund" v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view> -->
<view class='bnt b-color' @click="goOrderConfirm" v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 && orderInfo.activity_type!=4 && orderInfo.activity_type!=10">再次购买</view>
</block>
</view>

@ -12,12 +12,12 @@
<view>下单时间</view>
<view class='itemCom'>{{order_pay_info.create_time}}</view>
</view>
<view class='item acea-row row-between-wrapper'>
<!-- <view class='item acea-row row-between-wrapper'>
<view>支付方式</view>
<view v-if="order_pay_info.pay_type==1 || order_pay_info.pay_type==2 || order_pay_info.pay_type==3" class='itemCom'>微信</view>
<view v-else-if="order_pay_info.pay_type==4 || order_pay_info.pay_type==5" class='itemCom'>支付宝</view>
<view v-else class='itemCom'>余额</view>
</view>
</view> -->
<view class='item acea-row row-between-wrapper'>
<view>支付金额</view>
<view class='itemCom'>{{order_pay_info.pay_price}}</view>

@ -188,10 +188,6 @@
<image class="img-copyright" :src="copyright.image" mode="widthFix"></image>
<view class="text">{{copyright.Copyright}}</view>
</view>
<view v-else class="copy-right">
<view class="iconfont icon-crmeb"></view>
<view class="text">众邦科技提供技术支持</view>
</view>
<view style="height: 50rpx;"></view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize>
<!-- #ifndef H5 -->
@ -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);
});
},
//

@ -179,6 +179,7 @@
console.log(res, '回调')
that.uploadImg.push(res.data.path);
that.$set(that, 'uploadImg', that.uploadImg);
console.log(that.uploadImg);
});
},
//

@ -273,7 +273,34 @@
</view>
</form>
</view>
<view class='wrapper'>
<view class='wrapper' v-if="pay_types == 1">
<view class='item'>
<view>支付方式</view>
<view class="offline">
<view class="img-wrap">
<view class="img-box">
<image :src="pay_image_1"></image>
<image :src="pay_image_2"></image>
</view>
</view>
</view>
</view>
<view class="item">
<view>支付凭证</view>
</view>
<view class="item item-box">
<view class="upload-img">
<view class="img-wrapper" v-if="uploadImg">
<image :src="uploadImg"></image>
<view class="iconfont icon-guanbi1" @click="deleteImg"></view>
</view>
<view class="add-img" @click="uploadpics" v-if="isUpload">
<text class="iconfont icon-xiangji"></text>
</view>
</view>
</view>
</view>
<view class='wrapper' v-else>
<view class='item'>
<view>支付方式</view>
<view class='list'>
@ -310,7 +337,7 @@
</view>
<!-- #endif -->
</view>
</view>
</view>
</view>
<view class='moneyList'>
<view class='item acea-row row-between-wrapper'>
@ -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;
}
}
}
</style>

@ -217,18 +217,18 @@
<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
</block>
<block v-if="item.status == 2">
<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
<text class="iconfont icon-fabu"></text>
发布种草
</navigator>
</navigator> -->
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价</view>
</block>
<block v-if="item.status == 3">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">查看详情</view>
<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
<text class="iconfont icon-fabu"></text>
发布种草
</navigator>
</navigator> -->
<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
</block>
</view>

@ -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,
// }
}

Loading…
Cancel
Save