Skip to content

拼
拼时代
Commit 1b70013f authored by xieyishang's avatar xieyishang
Browse files
Options

addxx

parent 24d9888f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 284 deletions
app.js
View file @ 1b70013f
......@@ -82,7 +82,8 @@ App({
ImgPath: "https://pindev.jxdsy.cn",
clientImgPath: "https://pindev.jxdsy.cn/static/applet5",
staticUrl:'https://pindev.jxdsy.cn/attachs/',
// staticUrl:'https://pindev.jxdsy.cn/attachs/',
staticUrl:"https://luma.jxdsy.cn/attachs/",
private_key: Private_key,
navHeight: 0,
......
components/dialog/evaluate_wd/evaluate_wd.js
View file @ 1b70013f
// components/dialog/evaluate_wd/evaluate_wd.js
const app = getApp();
var img_host = app.globalData.ImgPath;
var staticUrl = app.globalData.staticUrl;
var clientImgPath = app.globalData.clientImgPath;
Component({
/**
......@@ -22,6 +23,7 @@ Component({
animationData: {},//
isFolded: true,
img_host:img_host,
staticUrl,
clientImgPath: clientImgPath
},
......
components/dialog/evaluate_wd/evaluate_wd.wxml
View file @ 1b70013f
......@@ -28,7 +28,7 @@
<!-- 评论图片 固定三个-->
<view class="pingLun_img">
<view class="pingLun_img_zi" wx:for="{{item.img_url_arr}}" wx:key="index" wx:for-item="img">
<image src="{{img_host}}/attachs/{{img}}"></image>
<image src="{{staticUrl}}{{img}}"></image>
</view>
</view>
<!-- 评论文本 -->
......
images/lmping/pingbg.png
View replaced file @ 24d9888f View file @ 1b70013f
images/lmping/pingbg.png

351 KB | W: | H:

images/lmping/pingbg.png

352 KB | W: | H:

images/lmping/pingbg.png
images/lmping/pingbg.png
images/lmping/pingbg.png
images/lmping/pingbg.png
  • 2-up
  • Swipe
  • Onion skin
pages/Ishop/Ishop.js
View file @ 1b70013f
......@@ -7,6 +7,7 @@ import {
var clientImgPath = app.globalData.clientImgPath;
var img_host = app.globalData.ImgPath;
var staticUrl = app.globalData.staticUrl;
Page({
/**
......@@ -16,6 +17,7 @@ Page({
shop_id: '',
img_host: img_host,
clientImgPath: clientImgPath,
staticUrl,
currentTab: 0,
......
pages/Ishop/Ishop.wxml
View file @ 1b70013f
......@@ -3,7 +3,7 @@
<view class="boxs">
<view class="ali-c">
<view class="shpuimg">
<image src="{{img_host}}/attachs/{{shop.logo}}"></image>
<image src="{{staticUrl}}{{shop.logo}}"></image>
</view>
<view class="flex1 ml-30">
<view class="zi_wmax sz_34 c_bi">{{shop.shop_name}}
......
pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant.js
View file @ 1b70013f
......@@ -2,6 +2,7 @@
const app = getApp();
var clientImgPath = app.globalData.clientImgPath;
var img_host = app.globalData.ImgPath;
var staticUrl = app.globalData.staticUrl;
import {
orderStatus,
orderGoodsList,
......@@ -20,7 +21,9 @@ Page({
pageNum: 1,
is_loading_done: false,
statusTab: '1',
clientImgPath: clientImgPath
clientImgPath: clientImgPath,
staticUrl,
},
//点击切换
clickTab: function (e) {
......@@ -224,7 +227,7 @@ Page({
//查看物流
logistics: function (order_id, action,vendor_id) {
wx.navigateTo({
url: '/pages/shop/order/weidianorder/check_logistics/check_logistics?order_id=' + order_id + '&action=' + action+ '&vendor_id=' + vendor_id
url: '/pages/check_logistics/check_logistics?order_id=' + order_id + '&action=' + action+ '&vendor_id=' + vendor_id
})
},
//跳转订单详情
......
pages/Ishop/weidianLine_list_merchant/weidianLine_list_merchant.wxml
View file @ 1b70013f
......@@ -33,21 +33,21 @@
<view class="mt-30" wx:for='{{item.products}}' wx:for-item="orderG" data-orderid='{{item.order_id}}' wx:for-index="vendorid" catchtap="operation" wx:key="index" data-action='orderDetails' >
<view wx:for='{{orderG.orderGoods}}' wx:for-item="product" class="flex" style="margin:0 0 20rpx 0;">
<view class="tuimg br_10 ov">
<image src='{{img_host}}/attachs/{{product.photo}}' wx:if="{{product.photo}}"></image>
<image src='{{img_host}}/attachs/{{item.photo}}' wx:else></image>
<image src='{{staticUrl}}{{product.photo}}' wx:if="{{product.photo}}"></image>
<image src='{{staticUrl}}{{item.photo}}' wx:else></image>
</view>
<view class="flex1 ml-25">
<view style="height:70rpx">
<view class="sz_30 bt_hei twoline btli" >{{product.goods_name}}</view>
</view>
<view class="sz_26 bt_hei mt-10">直购价{{product.fprice}}元 <text class="ml-20"wx:if="{{item.buytype==0 && product.recprice >0}}">充值免费价{{product.recprice}}元</text> </view>
<view class="sz_26 bt_hei mt-10">{{product.fprice}}元 </view>
<view class="sz_26 inp_hui mt-10">{{product.sku_name||''}}</view>
<view class="sz_26 inp_hui mt-10">数量: x {{product.goodsnum}}</view>
</view>
</view>
<block wx:for='{{orderG.operation}}' wx:for-item="action">
<view class='sz_28 ml-20 box {{action.class_name}}' data-orderid='{{item.order_id}}' catchtap="operation" data-action='{{action.way}}' data-is_ld='{{item.buytype}}' data-vendor_id="{{vendorid}}" >{{action.name}}</view>
<view class='sz_28 ml-20 box {{action.class_name}}' data-orderid='{{item.order_id}}' catchtap="operation" data-action='{{action.way}}' data-is_ld='{{item.buytype}}' data-vendor_id="{{item.products[1].orderGoods[0].vendor_id}}" >{{action.name}}</view>
</block>
</view>
<view class="xian mt-30 mb-30"></view>
......@@ -59,7 +59,7 @@
<view class="ali-e">
<view class="ali-c">
<block wx:for='{{item.order_operation}}' wx:for-item="action" wx:key="index">
<view class='sz_28 ml-20 {{action.class_name}}' data-orderid='{{item.order_id}}' catchtap="operation" data-action='{{action.way}}' data-is_ld='{{item.buytype}}'>{{action.name}}</view>
<view class='sz_28 ml-20 {{action.class_name}}' data-orderid='{{item.order_id}}' catchtap="operation" data-action='{{action.way}}' data-is_ld='{{item.buytype}}' data-vendor_id="{{item.products[1].orderGoods[0].vendor_id}}" >{{action.name}}</view>
</block>
</view>
......
pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item.js
View file @ 1b70013f
......@@ -13,6 +13,7 @@ Page({
data: {
img_host: app.globalData.ImgPath,
clientImgPath: app.globalData.clientImgPath,
staticUrl: app.globalData.staticUrl,
},
......
pages/Ishop/weidianLine_merchant_item/weidianLine_merchant_item.wxml
View file @ 1b70013f
......@@ -30,8 +30,8 @@
</view>
<view class="flex mt-30" wx:for='{{detail.products}}' wx:key='index' wx:for-item="item">
<view class="tuimg br_10 ov">
<image src='{{img_host}}/attachs/{{item.photo}}' wx:if="{{item.photo}}"></image>
<image src='{{img_host}}/attachs/{{detail.photo}}' wx:else></image>
<image src='{{staticUrl}}{{item.photo}}' wx:if="{{item.photo}}"></image>
<image src='{{staticUrl}}{{detail.photo}}' wx:else></image>
</view>
<view class="flex1 ml-25">
<view class="sz_30 bt_hei twoline" style="height:65rpx">{{item.goods_name}}</view>
......
pages/aboutus/aboutusnav/aboutusnav.wxml
View file @ 1b70013f
<!--pages/aboutus/aboutusnav/aboutusnav.wxml-->
<!--pages/personal//synopsisLuma/synopsisLuma.wxml-->
<view class="logoimg"><image src="/images/shilu-login/logo.png"></image></view>
<view class="logoimg"><image src="/images/shilu-login/logo.jpg"></image></view>
<view class="sz_34 bt_hei te_ct mt-15">悦想拼 <text wx:if="{{version}}">V{{version}}</text></view>
<view class="boxs">
......
pages/bankCard_list/bankCard_list.js
View file @ 1b70013f
......@@ -12,7 +12,7 @@ Page({
host_img: app.globalData.ImgPath,
clientImgPath: clientImgPath,
hidden: false, //是否显示授权弹窗
issel:0,
},
/**
......@@ -23,6 +23,7 @@ Page({
that.setData({
type: options.type,
url: options.url ? unescape(options.url) : "",
issel:options.issel,//是否过来选地址 1是 否则不是
})
},
......@@ -105,10 +106,14 @@ Page({
handleClick: function (e) {
var that = this;
if (that.data.type) {
wx.redirectTo({
url: "/" + that.data.url + "?bank_id=" + e.currentTarget.dataset.id + '&type=' + that.data.type,
let item = e.currentTarget.dataset.item;
if (that.data.issel) {//是否进来选择
wx.setStorageSync('selbankcard', item);
wx.navigateBack({
})
// wx.redirectTo({
// url: "/" + that.data.url + "?bank_id=" + e.currentTarget.dataset.id + '&type=' + that.data.type,
// })
}
},
......
pages/bankCard_list/bankCard_list.wxml
View file @ 1b70013f
<view class="boxs">
<block wx:for='{{banklist}}' wx:key="index" wx:for-item="bank" wx:for-key="" >
<view class="box_yhk ov po_r mb-20" data-type="{{type}}" data-id="{{bank.id}}" bindtouchstart="handleTouchStart" bindtouchend="handleTouchEnd" bindlongpress="handleLongPress" bindtap="handleClick">
<view class="box_yhk ov po_r mb-20" data-type="{{type}}" data-id="{{bank.id}}" data-item="{{bank}}" bindtouchstart="handleTouchStart" bindtouchend="handleTouchEnd" bindlongpress="handleLongPress" bindtap="handleClick">
<view class="kaimg po_a"><image src="{{clientImgPath}}/images/bank/{{bank.bankbg}}.png"></image></view>
<view class="ali-c">
<view class="logoimg"></view>
......
pages/lmping/user/user.js
View file @ 1b70013f
......@@ -24,6 +24,8 @@ Page({
secret_key:"",//邀请码
is_shop:2,//1 商家 2不是商家
},
/**
......@@ -59,6 +61,7 @@ Page({
coupon_num: res.data.coupon_num,
spell_vip: res.data.spell_vip,
secret_key:res.data.secret_key,
is_shop:res.data.is_shop,//是否是商家
})
}
})
......
pages/lmping/user/user.wxml
View file @ 1b70013f
......@@ -100,7 +100,7 @@
</navigator>
<navigator url="/pages/withdraw/withdraw" class="navitem" hover-class="none">
<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
<image class="imgiocn imgiocn11" src="{{clientImgPath}}/images/lmping/withdraw.png" mode=""></image>
<view class="navnames">前往提现</view>
</navigator>
......@@ -146,31 +146,35 @@
<navigator url="/pages/set/set" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
<image class="imgiocn imgiocn14" src="{{clientImgPath}}/images/lmping/seticon.png" mode=""></image>
<view class="navnames">设置中心</view>
</navigator>
<navigator url="/pages/lmping/profitlog/profitlog" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
<image class="imgiocn imgiocn13" src="{{clientImgPath}}/images/lmping/profitlog.png" mode=""></image>
<view class="navnames">收益明细</view>
</navigator>
<navigator url="/pages/aboutus/aboutusnav/aboutusnav" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
<view class="navnames">关于我们</view>
</navigator>
<!-- /pages/Ishop/Ishop -->
<navigator url="/pages/Ishop/Ishop" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
<navigator wx:if="{{is_shop==1}}" url="/pages/Ishop/Ishop" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn16" src="{{clientImgPath}}/images/lmping/mystoreicon.png" mode=""></image>
<view class="navnames">我的店铺</view>
</navigator>
<navigator url="/pages/order/order" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn10" src="{{clientImgPath}}/images/lmping/proto.png" mode=""></image>
<image class="imgiocn imgiocn15" src="{{clientImgPath}}/images/lmping/snedorder.png" mode=""></image>
<view class="navnames">发货订单</view>
</navigator>
<navigator url="/pages/aboutus/aboutusnav/aboutusnav" class="navitem" style="margin-top: 57rpx;" hover-class="none">
<image class="imgiocn imgiocn12" src="{{clientImgPath}}/images/lmping/aboutus.png" mode=""></image>
<view class="navnames">关于我们</view>
</navigator>
</view>
......
pages/lmping/user/user.wxss
View file @ 1b70013f
......@@ -213,6 +213,33 @@ page {
height: 55rpx;
}
.servehall .servehall_body .imgiocn11{
width: 60rpx;
height: 45rpx;
}
.servehall .servehall_body .imgiocn12{
width: 55rpx;
height: 49rpx;
}
.servehall .servehall_body .imgiocn13{
width: 50rpx;
height: 55rpx;
}
.servehall .servehall_body .imgiocn14{
width: 58rpx;
height: 58rpx;
}
.servehall .servehall_body .imgiocn15{
width: 50rpx;
height: 54rpx;
}
.servehall .servehall_body .imgiocn16{
width: 53rpx;
height: 53rpx;
}
.servehall .servehall_body .navnames {
color: #000000;
......
pages/order/order.wxml
View file @ 1b70013f
......@@ -53,8 +53,8 @@
<view wx:for='{{orderG.orderGoods}}' wx:for-item="product" class="flex" style="margin:0 0 20rpx 0;"
wx:key="key">
<view class="tuimg br_10 ov">
<image src='{{img_host}}/attachs/{{product.photo}}' wx:if="{{product.photo}}"></image>
<image src='{{img_host}}/attachs/{{item.photo}}' wx:else></image>
<image src='{{staticUrl}}{{product.photo}}' wx:if="{{product.photo}}"></image>
<image src='{{staticUrl}}{{item.photo}}' wx:else></image>
</view>
<view class="flex1 ml-25">
<view class="sz_30 bt_hei twoline" style="height:84rpx">{{product.goods_name}}</view>
......@@ -147,8 +147,8 @@
data-index="{{index}}" data-action='getRefundDetail' wx:key="vendorid">
<view class="flex" style="margin:0 0 20rpx 0;">
<view class="tuimg br_10 ov">
<image src='{{img_host}}/attachs/{{orderRefund.photo}}' wx:if="{{orderRefund.photo}}"></image>
<image src='{{img_host}}/attachs/{{orderRefund.photo}}' wx:else></image>
<image src='{{staticUrl}}{{orderRefund.photo}}' wx:if="{{orderRefund.photo}}"></image>
<image src='{{staticUrl}}{{orderRefund.photo}}' wx:else></image>
</view>
<view class="flex1 ml-25">
<view class="sz_30 bt_hei twoline" style="height:84rpx">{{orderRefund.goods_name}}</view>
......
pages/order/order.wxss
View file @ 1b70013f
......@@ -189,7 +189,7 @@ view {
}
.nav-item {
width: 20%;
width: 25%;
display: inline-block;
text-align: center;
}
......
pages/orderdetail/orderdetail.js
View file @ 1b70013f
......@@ -11,6 +11,7 @@ Page({
img_host: app.globalData.ImgPath,
clientImgPath: app.globalData.clientImgPath,
staticUrl:app.globalData.staticUrl,
showDialog: false,
// 倒计时
page:1,
......
pages/orderdetail/orderdetail.wxml
View file @ 1b70013f
This diff is collapsed.
pages/register/register.wxml
View file @ 1b70013f
<!--pages/register/register.wxml-->
<view class="content1">
<view class="header">
<image src="/images/shilu-login/logo.png"></image>
<image src="/images/shilu-login/logo.jpg"></image>
</view>
<view class="list">
......
pages/shop/shops/weidian/ping_details/ping_details.js
View file @ 1b70013f
......@@ -7,6 +7,7 @@ var wxParse = require('../../../../../components/wxParse/wxParse.js');
var img_host = app.globalData.ImgPath;
var clientImgPath = app.globalData.clientImgPath;
var staticUrl = app.globalData.staticUrl;
import { nowJoinGroup } from "../../../../../api/lmping.js";
......@@ -73,6 +74,7 @@ Page({
indicatorActiveColor: "#f64f15",
cart_count: 0,
clientImgPath: clientImgPath,
staticUrl,
checkedSpec: '',
spec: {},
spec_key: [],
......@@ -130,10 +132,10 @@ Page({
is_auto:is_auto,
}).then((res) => {
if (res.code == 0) {
wx.showToast({
title: res.msg,
icon: "none"
})
// wx.showToast({
// title: res.msg,
// icon: "none"
// })
this.setData({
showpuptwos:true,
})
......@@ -233,7 +235,7 @@ Page({
onShareAppMessage() {
return {
// title: this.data.goods.title.substring(0, 25),
// imageUrl: this.data.img_host + '/attachs/' + this.data.imgUrls[0].photo,
// imageUrl: this.data.staticUrl + '' + this.data.imgUrls[0].photo,
// path: 'pages/shop/shops/weidian/weidian_details/weidian_details?goods_id=' + this.data.goods_id + '&fxuser_id=' + this.data.user_id + '&productType=wechat'
}
},
......@@ -241,7 +243,7 @@ Page({
onShareTimeline() {
return {
// title: this.data.goods.title.substring(0, 25),
// imageUrl: this.data.img_host + '/attachs/' + this.data.imgUrls[0].photo
// imageUrl: this.data.staticUrl + '' + this.data.imgUrls[0].photo
}
},
/**
......
pages/shop/shops/weidian/ping_details/ping_details.wxml
View file @ 1b70013f
......@@ -18,14 +18,14 @@
<swiper-item class="item">
<image
wx-if='{{item.photo}}'
src="{{img_host}}/attachs/{{item.photo}}"
src="{{staticUrl}}{{item.photo}}"
class="slide-image"
bindload='getHeight'
style="width:100%;height:100%;"
/>
<image
wx-if='{{!item.photo}}'
src="{{img_host}}/attachs/{{tuimg}}"
src="{{staticUrl}}{{tuimg}}"
class="slide-image"
bindload='getHeight'
style="width:100%;height:100%;"
......@@ -36,7 +36,7 @@
<block wx:else>
<swiper-item class="item" style="height:{{swiperH}};">
<image
src="{{img_host}}/attachs/{{goods.img}}"
src="{{staticUrl}}{{goods.img}}"
class="slide-image"
bindload='getHeight'
style="width:100%;height:100%;"
......@@ -93,7 +93,7 @@
<!-- 评价 -->
<view class="topboxss_t">
<!-- <view class="topboxss_t">
<view class="nr_t_l mb-20">
<view class="twb">商品评价（{{goods.comment_count}}条）</view>
<view class="nr_t_l_r" bindtap="evaluate">查看更多></view>
......@@ -109,13 +109,13 @@
<view class="ali-c">
<block wx:for='{{goods.comment_list[0].img_url_arr}}' wx:key="index">
<view class="nr_img mr-20">
<image src="{{img_host}}/attachs/{{item}}" />
<image src="{{staticUrl}}{{item}}" />
</view>
</block>
</view>
<view class="ali-z pb-20 pbox mt-20" wx:if="{{goods.comment_list[0].reply_content!=''}}">
<view/>
<!-- 商家回复 -->
<view class="pingLun-Inthep_sj" wx:if="{{goods.comment_list[0].reply_content!=null}}">
店家回复:
<text >{{goods.comment_list[0].reply_content}}</text>
......@@ -123,7 +123,7 @@
</view>
</view>
</view>
<view class="xianhui" />
<view class="xianhui" /> -->
<!-- 详情 -->
<view class="sp_xq spxq">
......
pages/withdraw/withdraw.js
View file @ 1b70013f
......@@ -61,8 +61,12 @@ Page({
// 跳转银行卡列表
bankCardList: function (e) {
var type = e.currentTarget.dataset.type;
// wx.navigateTo({
// url: '/pages/bankCard_list/bankCard_list?url=' + app.getCurrentPageUrl() + '&type=' + type,
// })
wx.navigateTo({
url: '/pages/bankCard_list/bankCard_list?url=' + app.getCurrentPageUrl() + '&type=' + type,
url: '/pages/bankCard_list/bankCard_list?issel=1',
})
},
......@@ -87,6 +91,16 @@ Page({
}
this.setData({ hidden:false });
this.onLoadFun();
//选银行卡
let selbankcard = wx.getStorageSync('selbankcard');
if(selbankcard){
wx.setStorageSync('selbankcard', "");
this.setData({
bank_id: selbankcard.bank_id,
bank:selbankcard,
})
}
},
/**
......
pages/withdraw/withdraw.wxml
View file @ 1b70013f
......@@ -158,7 +158,7 @@
<view class="xian"></view>
<view class=" mt-40 mb-30">
<!-- 有银行卡 -->
<block wx:if="{{bank}}">
<block wx:if="{{bank.id}}">
<view class="sz_30 bt_hei">到账银行卡</view>
<view class="ali-c mt-30" data-type="{{type}}" bindtap="bankCardList">
<view class="touxiangimg ov">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment