miniprogram / tuangou · 提交

转到一个项目

作者 lihongjuan
提交 ede8e8763bf2f15a35c772c1af9808dfd4fcf7df 1 个父辈 8fcfe970

提交

内嵌 并排对比
正在显示 17 个修改的文件 包含 388 行增加 和 83 行删除
//app.js
App({
onLaunch: function () {
wx.getSystemInfo({
success: res => {
//导航高度
this.globalData.navHeight = res.statusBarHeight + 46;
}, fail(err) {
console.log(err);
}
})
// 展示本地存储能力
var logs = wx.getStorageSync('logs') || []
logs.unshift(Date.now())
... ... @@ -218,6 +228,7 @@ App({
globalData: {
userInfo: null,
cid: null,
class_id: null
class_id: null,
navHeight: 0
}
})
\ No newline at end of file
... ...
{
"pages": [
"pages/index/index",
"pages/mine/eOrder/eOrder",
"pages/homeindex/homeindex",
"pages/kind/kind",
"pages/homeindex/search/search",
... ... @@ -10,7 +12,6 @@
"pages/kind/firm_order1/firm_order1",
"pages/kind/success/success",
"pages/mine/contactUs/contactUs",
"pages/mine/eOrder/eOrder",
"pages/mine/myOrder/myOrder",
"pages/mine/addr_2/addr_2",
"pages/mine/addr_1/addr_1",
... ...
... ... @@ -28,3 +28,27 @@
.icon-kefu:before {
content: "\e658";
}
.ping{
display:flex;
justify-content: center
}
.noorder{
width:270rpx;
height:270rpx;
font-size: 0;
margin:0 auto;
}
.noorder image{
width:100%;
height:100%;
}
.noordertitle{
color:#999999;
font-size: 26rpx;
text-align: center;
margin-top:20rpx
}
\ No newline at end of file
... ...
... ... @@ -20,7 +20,8 @@ Page({
seconds: 0,
over:true,
short:[],
seemore:true
seemore:true,
images:[]
},
/**
... ... @@ -35,6 +36,45 @@ Page({
this.detaiFun(options.id)
},
slectpic(e){
let that=this;
console.log(e)
let idx=e.currentTarget.dataset.idx;
let newassess = that.data.assess;
for (var i = 0; i < newassess.length;i++){
if(i==idx){
that.setData({
images: newassess[i].img
})
}
}
console.log(that.data.images)
},
// 图片预览
previewImage: function (e) {
let that = this;
console.log(e)
let idx = e.currentTarget.dataset.idx;
let newassess = that.data.assess;
for (var i = 0; i < newassess.length; i++) {
if (i == idx) {
that.setData({
images: newassess[i].img
})
}
}
var current = e.target.dataset.src
wx.previewImage({
current: current,
urls: this.data.images
})
},
//已成团
group(){
... ... @@ -51,9 +91,32 @@ Page({
})
},
moresee(){
this.setData({
let that = this;
that.setData({
seemore:false
})
let url = "home/index/shopMessage";
let header = {
"XX-Token": wx.getStorageSync('token'),
"XX-Device-Type": 'wxapp'
}
let params = {
shop_id: that.data.detail_id,
}
app.post(url, params, header).then((res) => {
console.log(res)
let masarr = []
that.setData({
// short: masarr,
//assess: res.data
assess:res.data
})
}).catch((err) => {
console.log(err)
})
},
... ... @@ -163,15 +226,18 @@ Page({
console.log(res)
let masarr=[]
for (var i = 0; i < res.data.length;i++){
if(i<10){
if(i<5){
masarr.push(res.data[i])
}
}
that.setData({
short: masarr,
assess: res.data
// short: masarr,
//assess: res.data
assess: masarr
})
console.log(that.data.assess)
}).catch((err) => {
console.log(err)
})
... ...
... ... @@ -3,8 +3,8 @@
<view class="pagecontainer">
<import src="../../../wxParse/wxParse.wxml" />
<view class='container'>
<import src="../../../wxParse/wxParse.wxml" />
<view class='container'>
<view class='ware_box'>
<view class='ware_top'>
<view class='ware_1'>
... ... @@ -62,14 +62,14 @@
<view class='ware_bot_txt'>{{detailCon.recommend}}</view>
</view>
</view>
</view>
<!-- 商品规格 -->
<view class='spec'>
</view>
<!-- 商品规格 -->
<view class='spec'>
<view class='spec_txt'>商品规格</view>
<view class='spec_txt2'>{{detailCon.shop_type1}}</view>
</view>
<!-- 商品详情 -->
<view class='ware_detail'>
</view>
<!-- 商品详情 -->
<view class='ware_detail'>
<view class='ware_detail_tit'>
<view class="ware_detail_box {{index == 1 ? 'ware_active' : ''}}" bindtap='goy' data-id="1">商品详情</view>
<view class="ware_detail_box {{index == 2 ? 'ware_active' : ''}}" bindtap='goy' data-id="2">用户评价</view>
... ... @@ -82,7 +82,18 @@
</view>
<!-- 用户评价 -->
<view class='ware_assess' wx:if="{{index == 2}}">
<view class='ware_assess_li' wx:for="{{assess}}" wx:key="index">
<view class="noping" wx:if="{{assess.length==0}}">
<view class="noorder">
<image src="/img/noorder.png" mode="widthFix"></image>
</view>
<view class="noordertitle">暂无评价</view>
</view>
<view wx:else>
<!-- <block wx:if="{{seemore}}">
<view class='ware_assess_li 345' wx:for="{{short}}" wx:key="index">
<view class='assess_header'>
<view class='assess_headerImg'>
<image src='{{item.avatar}}'></image>
... ... @@ -93,47 +104,60 @@
{{item.text}}
</view>
<block wx:if="{{item.img.length!=0}}">
<view class='ware_pic' wx:for="{{item.img}}" wx:key=''>
<view class='ware_picBox'>
<view class='ware_pic'>
<view class='ware_picBox' wx:for="{{item.img}}" wx:key=''>
<image src='{{item}}'></image>
</view>
</view>
</block>
<view class='assess_time'>2019/07/01</view>
</view>
<!-- <view class='ware_assess_li'>
</block> -->
<block>
<view class='ware_assess_li 123' wx:for="{{assess}}" wx:key="index" wx:for-item="items" wx:for-index="indexs">
<view class='assess_header'>
<view class='assess_headerImg'>
<image src='../../../img/jujia@2x.png'></image>
<image src='{{items.avatar}}'></image>
</view>
<view class='assess_headerTxt'>朱*明</view>
<view class='assess_headerTxt'>{{items.user_nickname}}</view>
</view>
<view class='assess_say'>
质量很不错，很喜欢。
{{items.text}}
</view>
<view class='ware_pic'>
<view class='ware_picBox'>
<image src='../../../img/gerenzhingxinbeijing@2x.png'></image>
<block wx:if="{{item.img.length!=0}}">
<view class='ware_pic' >
<view class='ware_picBox' wx:for="{{items.img}}" wx:key=''>
<image src='{{item}}' bindtap="previewImage" data-src="{{item}}" data-idx="{{indexs}}"></image>
</view>
<view class='ware_picBox'>
<image src='../../../img/gerenzhingxinbeijing@2x.png'></image>
</view>
</block>
<view class='assess_time'>{{items.create_time}}</view>
</view>
<view class='assess_time'>2019/07/01</view>
</view> -->
</block>
<block wx:if="{{assess.length==5}}">
<view class='whole' wx:if="{{seemore}}" bindtap="moresee">
查看全部评价
</view>
</block>
</view>
</view>
</view>
<!-- footer底部 -->
<view class='footer'>
</view>
</view>
<!-- footer底部 -->
<view class='footer'>
<view class="kefu">
<view class="kefu">
<view class="iconfont icon-kefu"></view>
<button class="remaindetail" open-type="contact" style="margin-left: 0"></button>
</view>
</view>
<view class='footer_add' bindtap='addFun' wx:if="{{detailCon.collect_type==0}}">加入收藏</view>
<view class='footer_add' bindtap='addFun' wx:if="{{detailCon.collect_type==1}}">取消收藏</view>
... ... @@ -143,11 +167,11 @@
</view>
<view class='footer_over' wx:else bindtap="gameover">活动结束</view>
</view>
<!-- 遮罩层 -->
<view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
<!-- 弹出层 -->
<view class="modalDlg" wx:if="{{showModal}}">
</view>
<!-- 遮罩层 -->
<view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
<!-- 弹出层 -->
<view class="modalDlg" wx:if="{{showModal}}">
<view class='modalDlg_p'>
<view class='m_top'>
<view class='m_topImg'>
... ... @@ -174,5 +198,5 @@
</view>
<button class='m_btn' bindtap='goFirm_order1' data-id="{{detailCon.shop_id}}">确认</button>
</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -353,12 +353,13 @@ page {
}
.ware_pic {
display: flex;
width: 100%;
margin-top: 10rpx;
display:flex;
margin-top: 16rpx;
flex-wrap: wrap;
}
.ware_picBox {
flex:0 0 auto;
margin-right: 16rpx;
}
... ...
... ... @@ -22,32 +22,67 @@ Page({
hours: '',
minutes: '',
seconds: '',
navH: '',
nav:''
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options)
if(options.nav!=undefined){
this.setData({
nav:1
})
}
console.log(options.num)
this.setData({
shop_id: options.id,
shopnum:options.num
shopnum:options.num,
})
this.setData({
navH: app.globalData.navHeight
})
console.log(options.id)
},
go() {
if (this.data.nav == 1) {
wx.switchTab({
url: '/pages/homeindex/homeindex',
})
} else {
wx.navigateBack({
checked: true
})
}
},
//输入备注
entertext(e){
this.setData({
text:e.detail.value
})
},
//选择地址
selectplace(){
wx.navigateTo({
url: '/pages/mine/addr_1/addr_1?shop_id='+this.data.shop_id+'&shopnum='+this.data.shopnum,
})
wx.setStorageSync('shopid', this.data.shop_id)
wx.setStorageSync('shopnum', this.data.shopnum)
},
//添加收货地址
addplace(){
wx.navigateTo({
url: '/pages/mine/addr_2/addr_2',
url: '/pages/mine/addr_2/addr_2?noorder=' + 1 + '&noorderid=' + this.data.shop_id + '&num=' + this.data.shopnum,
})
},
... ... @@ -65,13 +100,18 @@ Page({
}
app.post(url, params, header).then((res) => {
console.log(res)
if(res.data.address_id==0){
that.setData({
address: true,
})
}
that.setData({
order_list: res.data,
shop_numb: res.data.shop_numb,
goods: res.data.goods,
address_id: res.data.address_id,
text: that.data.text,
address:false,
shopinfo:true
})
... ... @@ -147,9 +187,9 @@ Page({
}
})
that.setData({
address:true
})
// that.setData({
// address:true
// })
} else if (err.msg == "商品已到时"){
wx.showModal({
title: '提示',
... ... @@ -194,14 +234,15 @@ Page({
},
paynow(){
let that = this;
// if(that.data.text==''){
// wx.showToast({
// title: '请输入备注信息',
// icon:'none'
// })
console.log(that.data.address_id)
if (that.data.address_id==0){
wx.showToast({
title: '请选择收货地址',
icon:'none'
})
// return false
// }
return false
}
let url = "home/index/pay";
let header = {
"XX-Token": wx.getStorageSync('token'),
... ...
{
"navigationBarTitleText": "确认订单",
"navigationBarBackgroundColor": "#6EAC3D",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"navigationStyle": "custom"
}
... ...
<!--pages/kind/firm_order1/firm_order1.wxml-->
<view class='container'>
<view>
<view class='nav bg-white' style='height:{{navH}}px' catchtap='go'>
<view class="rowback">
<!-- <image src="/img/aicon_08@2x.png"></image> -->
<view class="iconfont icon-jiantou-copy"></view>
</view>
<view class='nav-title'>
确认订单
<image src='../../images/back.png' mode='aspectFit' class='back' bindtap='navBack'></image>
</view>
</view>
<scroll-view class='bg-gray overflow' style='height:calc(100vh - {{navH}}px)' scroll-y>
<view class='container'>
<!-- 顶部背景 -->
<view class='header'></view>
<!-- 订单详情 -->
<view class='order_box'>
<!-- 个人信息 -->
<view class='o_top'>
<view class='o_top' wx:if="{{address==true}}" bindtap="addplace">
<view class='o_topIn'>
<view class='o_topImg'>
<image src='../../../img/jujia@2x.png'></image>
</view>
<view class='o_text' wx:if="{{address==true}}" bindtap="addplace">
<view class='o_text'>
<view class='name shouhuo'>请选择收货地址</view>
</view>
<view class='o_text' wx:else>
<image class='o_right' src='../../../img/right_1.png'></image>
</view>
<image class='o_top_bottom' src='../../../img/kuaidi@2x.png'></image>
</view>
<view class='o_top' wx:else bindtap="selectplace">
<view class='o_topIn'>
<view class='o_topImg'>
<image src='../../../img/jujia@2x.png'></image>
</view>
<view class='o_text' >
<view class='o_namePhone'>
<view class='name'>{{order_list.name}}</view>
<view class='phone'>{{order_list.mobile}}</view>
... ... @@ -75,8 +102,8 @@
</view>
</view>
</view>
</view>
<view class='footer' wx:if="{{shopinfo==true}}">
</view>
<view class='footer' wx:if="{{shopinfo==true}}">
<view class='footer_in'>
<view class='f_txt1'>共{{order_list.shop_numb}}件商品</view>
<view class='f_txt2'>合计:
... ... @@ -84,4 +111,7 @@
</view>
<view class='f_btn' bindtap='paynow'>立即支付</view>
</view>
</view>
</scroll-view>
</view>
\ No newline at end of file
... ...
/* pages/kind/firm_order1/firm_order1.wxss */
@import '../../../iconfont/iconfont.wxss';
.icon-jiantou-copy{
font-size:35rpx;
color:#fff;
transform:rotate(180deg);
/* font-weight: bold; */
}
page {
background: #f7f7f7;
}
... ... @@ -319,3 +326,66 @@ page {
color:#999;
margin-top:27rpx;
}
/* 高度的设置 */
.nav {
width: 100%;
overflow: hidden;
position: relative;
top: 0;
left: 0;
z-index: 10;
background: #6EAC3D
}
.nav-title {
width: 100%;
height: 45px;
line-height: 45px;
text-align: center;
position: absolute;
bottom: 0;
left: 0;
z-index: 10;
font-family: PingFang-SC-Medium;
font-size: 28rpx;
letter-spacing: 2px;
color:#fff;
}
.nav .back {
width: 22px;
height: 22px;
position: absolute;
bottom: 0;
left: 0;
padding: 10px 15px;
}
.bg-white {
background-color: #6EAC3D;
}
.bg-gray {
background-color: #f7f7f7;
}
.overflow {
overflow: auto;
}
.hidden {
overflow: hidden;
}
.rowback{
width:15rpx;
height:27rpx;
font-size: 0;
margin:79rpx 0 0 30rpx;
transform:rotate(180deg)
}
.rowback image{
width:100%;
height:100%;
}
\ No newline at end of file
... ...
... ... @@ -9,11 +9,21 @@ Page({
orderlist: [],
address_id: '',
status: 0,
shop_id:'',
shopnum:''
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options)
if(options.shop_id!=undefined){
this.setData({
shop_id:options.shop_id,
shopnum:options.shopnum
})
}
this.getaddresslist()
// this.setData({
... ... @@ -132,6 +142,16 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
let shopid=wx.getStorageSync("shopid");
let shopnum=wx.getStorageSync('shopnum')
if (shopid!=''){
wx.reLaunch({
url: '/pages/kind/firm_order1/firm_order1?id=' + shopid + '&num=' + shopnum + '&nav=' + 1,
})
}
wx.setStorageSync('shopid', '')
wx.setStorageSync('shopnum ', '')
},
... ...
... ... @@ -102,11 +102,12 @@ Page({
name: res.data.name,
mobile: res.data.mobile,
status: res.data.status,
type: res.data.status,
province: res.data.province,
city: res.data.city,
county: res.data.city,
address: res.data.address,
selectregion:res.data.province+res.data.city+res.data.county
})
... ... @@ -189,6 +190,7 @@ Page({
console.log(that.data.noorder)
if (that.data.noorder==1){
setTimeout(function () {
console.log(that.data.num)
wx.navigateTo({
url: '/pages/kind/firm_order1/firm_order1?num='+that.data.num+'&id='+that.data.noorderid,
})
... ...
... ... @@ -2,7 +2,17 @@
<view class='container'>
<view class='mid'>
<view class="nodata" wx:if='{{collectList.length==0}}'>暂无数据</view>
<view class="nodata" wx:if='{{collectList.length==0}}'>
<view class="noorder">
<image src="/img/noorder.png" mode="widthFix"></image>
</view>
<view class="noordertitle">暂无收藏数据</view>
</view>
<block wx:else>
<view class='mid_item' wx:for="{{collectList}}" wx:key="">
<!-- 顶部 -->
... ...
... ... @@ -281,6 +281,6 @@
white-space: nowrap;
}
.nodata{
margin-top: 20rpx;
margin-top: 350rpx;
font-size: 30rpx;
}
\ No newline at end of file
... ...
... ... @@ -36,6 +36,15 @@ Page({
// 发表评价
submitComment() {
let that = this;
if (that.data.text==''){
wx.showToast({
title: '请输入评论内容',
icon:'none'
})
return false
}
let url = 'user/index/message';
let params = {
goods_id : that.data.goods_id,
... ... @@ -101,7 +110,7 @@ Page({
console.log('上传文件' + JSON.stringify(res));
let data = JSON.parse(JSON.stringify(res))
console.log(data)
let arr=[];
let arr=that.data.images;
arr.push(data.url)
that.setData({
images: arr
... ... @@ -151,12 +160,15 @@ Page({
// });
},
delete: function (e) {
let that=this
var index = e.currentTarget.dataset.index;
var images = that.data.images;
images.splice(index, 1);
that.setData({
images: images
});
console.log(that.data.images)
},
/**
... ...
... ... @@ -393,18 +393,3 @@ margin-top:24rpx;
margin-top: 350rpx;
font-size: 30rpx;
}
.noorder{
width:270rpx;
height:270rpx;
font-size: 0
}
.noorder image{
width:100%;
height:100%;
}
.noordertitle{
color:#999999;
font-size: 26rpx;
text-align: center;
margin-top:20rpx
}
\ No newline at end of file
... ...
... ... @@ -39,7 +39,7 @@
"list": []
},
"miniprogram": {
"current": 7,
"current": 8,
"list": [
{
"id": -1,
... ... @@ -94,6 +94,13 @@
"id": -1,
"name": "搜索结果",
"pathName": "pages/homeindex/result/result",
"query": "",
"scene": null
},
{
"id": -1,
"name": "评价",
"pathName": "pages/mine/eOrder/eOrder",
"scene": null
}
]
... ...