Skip to content
GitLab
Commit a86ec8b6 authored by Junling Bu's avatar Junling Bu
Browse files

[litemall-wx, litemall-wx-api]: 小商场系统调整

parent 936b5511
Hide whitespace changes
Inline Side-by-side
litemall-wx/pages/index/index.wxss
View file @ a86ec8b6
......@@ -96,12 +96,12 @@
display: block;
font-size: 33rpx;
height: 43rpx;
color: #333;
color: #fff;
}
.a-brand .mt .price, .a-brand .mt .unit {
font-size: 25rpx;
color: #999;
color: #fff;
}
.a-brand .item-1 {
......
litemall-wx/pages/newGoods/newGoods.wxml
View file @ a86ec8b6
......@@ -30,7 +30,7 @@
<view class="b">
<block wx:for="{{goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
<navigator class="item {{iindex % 2 == 0 ? 'item-b' : '' }}" url="../goods/goods?id={{iitem.id}}">
<image class="img" src="{{iitem.listPicUrl}}" background-size="cover"></image>
<image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
<text class="name">{{iitem.name}}</text>
<text class="price">￥{{iitem.retailPrice}}</text>
</navigator>
......
litemall-wx/pages/topic/topic.wxml
View file @ a86ec8b6
<view class="container">
<scroll-view class="topic-list" scroll-y="true" scroll-top="{{scrollTop}}">
<navigator class="item" wx:for="{{topicList}}" wx:key="id" url="../topicDetail/topicDetail?id={{item.id}}">
<image class="img" src="{{item.scenePicUrl}}"></image>
<image class="img" src="{{item.picUrl}}"></image>
<view class="info">
<text class="title">{{item.title}}</text>
<text class="desc">{{item.subtitle}}</text>
<text class="price">{{item.priceInfo}}元起</text>
<text class="price">{{item.price}}元起</text>
</view>
</navigator>
<view class="page" wx:if="{{showPage}}">
......
litemall-wx/pages/topicComment/topicComment.js
View file @ a86ec8b6
......@@ -8,7 +8,7 @@ Page({
comments: [],
allCommentList: [],
picCommentList: [],
typeId: 0,
type: 0,
valueId: 0,
showType: 0,
allCount: 0,
......@@ -19,7 +19,7 @@ Page({
},
getCommentCount: function () {
let that = this;
util.request(api.CommentCount, { valueId: that.data.valueId, typeId: that.data.typeId}).then(function (res) {
util.request(api.CommentCount, { valueId: that.data.valueId, type: that.data.type}).then(function (res) {
if (res.errno === 0) {
that.setData({
......@@ -33,7 +33,7 @@ Page({
let that = this;
util.request(api.CommentList, {
valueId: that.data.valueId,
typeId: that.data.typeId,
type: that.data.type,
size: that.data.size,
page: (that.data.showType == 0 ? that.data.allPage : that.data.picPage),
showType: that.data.showType
......@@ -59,7 +59,7 @@ Page({
onLoad: function (options) {
// 页面初始化 options为页面跳转所带来的参数
this.setData({
typeId: options.typeId,
type: options.type,
valueId: options.valueId
});
this.getCommentCount();
......
litemall-wx/pages/topicCommentPost/topicCommentPost.js
View file @ a86ec8b6
......@@ -97,7 +97,7 @@ Page({
},
onLoad: function (options) {
if (parseInt(options.typeId) !== 1){
if (parseInt(options.type) !== 1){
return;
}
......@@ -131,7 +131,7 @@ Page({
}
util.request(api.CommentPost, {
typeId: 1,
type: 1,
valueId: that.data.valueId,
content: that.data.content,
star: that.data.star,
......
litemall-wx/pages/topicCommentPost/topicCommentPost.wxml
View file @ a86ec8b6
......@@ -2,7 +2,7 @@
<view class="post-comment">
<view class="goods">
<view class="img">
<image src="{{topic.scenePicUrl}}"></image>
<image src="{{topic.picUrl}}"></image>
</view>
<view class="info">
<view class="t">
......
litemall-wx/pages/topicDetail/topicDetail.js
View file @ a86ec8b6
......@@ -39,7 +39,7 @@ Page({
},
getCommentList() {
let that = this;
util.request(api.CommentList, { valueId: that.data.id, typeId: 1, showType: 0, page: 1, size: 5 }).then(function (res) {
util.request(api.CommentList, { valueId: that.data.id, type: 1, showType: 0, page: 1, size: 5 }).then(function (res) {
if (res.errno === 0) {
that.setData({
......@@ -55,7 +55,7 @@ Page({
}
else {
wx.navigateTo({
url: '/pages/topicCommentPost/topicCommentPost?valueId=' + this.data.id + '&typeId=1',
url: '/pages/topicCommentPost/topicCommentPost?valueId=' + this.data.id + '&type=1',
})
}
},
......
litemall-wx/pages/topicDetail/topicDetail.wxml
View file @ a86ec8b6
......@@ -26,7 +26,7 @@
</view>
</view>
<view class="load" wx:if="{{commentCount > 5}}">
<navigator url="/pages/topicComment/topicComment?valueId={{topic.id}}&typeId=1">查看更多</navigator>
<navigator url="/pages/topicComment/topicComment?valueId={{topic.id}}&type=1">查看更多</navigator>
</view>
</view>
<view class="no-comments" wx:if="{{commentList.length <= 0}}">
......@@ -42,7 +42,7 @@
</view>
<view class="b">
<navigator class="item" wx:for="{{topicList}}" wx:key="id" url="../topicDetail/topicDetail?id={{item.id}}">
<image class="img" src="{{item.scenePicUrl}}"></image>
<image class="img" src="{{item.picUrl}}"></image>
<text class="title">{{item.title}}</text>
</navigator>
</view>
......
litemall-wx/pages/ucenter/collect/collect.js
View file @ a86ec8b6
......@@ -5,7 +5,7 @@ var app = getApp();
Page({
data: {
typeId: 0,
type: 0,
collectList: [],
page: 1,
size: 10,
......@@ -16,7 +16,7 @@ Page({
title: '加载中...',
});
let that = this;
util.request(api.CollectList, { typeId: that.data.typeId, page: that.data.page, size: that.data.size }).then(function (res) {
util.request(api.CollectList, { type: that.data.type, page: that.data.page, size: that.data.size }).then(function (res) {
if (res.errno === 0) {
that.setData({
collectList: that.data.collectList.concat(res.data.collectList),
......@@ -74,7 +74,7 @@ Page({
success: function (res) {
if (res.confirm) {
util.request(api.CollectAddOrDelete, { typeId: that.data.typeId, valueId: goodsId}, 'POST').then(function (res) {
util.request(api.CollectAddOrDelete, { type: that.data.type, valueId: goodsId}, 'POST').then(function (res) {
if (res.errno === 0) {
console.log(res.data);
wx.showToast({
......
litemall-wx/pages/ucenter/collect/collect.wxml
View file @ a86ec8b6
......@@ -7,10 +7,10 @@
</view>
<view class="collect-list" wx:else>
<view class="item" bindtap="openGoods" bindtouchstart="touchStart" bindtouchend="touchEnd" wx:for="{{collectList}}" wx:key="id" data-index="{{index}}">
<image class="img" src="{{item.listPicUrl}}"></image>
<image class="img" src="{{item.picUrl}}"></image>
<view class="info">
<view class="name">{{item.name}}</view>
<view class="subtitle">{{item.goodsBrief}}</view>
<view class="subtitle">{{item.brief}}</view>
<view class="price">￥{{item.retailPrice}}</view>
</view>
</view>
......
litemall-wx/pages/ucenter/footprint/footprint.wxml
View file @ a86ec8b6
......@@ -10,10 +10,10 @@
<view class="day-hd" wx:if="{{item.length > 0}}">{{item[0].addTime}}</view>
<view class="day-list" wx:if="{{item.length > 0}}">
<view class="item" data-index="{{index}}" data-iindex="{{iindex}}" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" wx:for="{{item}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
<image class="img" src="{{iitem.listPicUrl}}"></image>
<image class="img" src="{{iitem.picUrl}}"></image>
<view class="info">
<view class="name">{{iitem.name}}</view>
<view class="subtitle">{{iitem.goodsBrief}}</view>
<view class="subtitle">{{iitem.brief}}</view>
<view class="price">￥{{iitem.retailPrice}}</view>
</view>
</view>
......
litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
View file @ a86ec8b6
......@@ -32,7 +32,7 @@
<view class="attr">{{item.goodsSpecificationValues}}</view>
<view class="price">￥{{item.retailPrice}}</view>
<view class="btn active" wx:if="{{handleOption.comment}}">
<navigator url="../../commentPost/commentPost?orderId={{item.orderId}}&&valueId={{item.goodsId}}&typeId=0">去评价</navigator>
<navigator url="../../commentPost/commentPost?orderId={{item.orderId}}&&valueId={{item.goodsId}}&type=0">去评价</navigator>
</view>
<view class="btn active" wx:if="{{handleOption.rebuy}}">
<navigator url="../../goods/goods?id={{item.goodsId}}">再次购买</navigator>
......
litemall-wx/project.config.json
View file @ a86ec8b6
......@@ -9,8 +9,8 @@
},
"compileType": "miniprogram",
"libVersion": "1.9.93",
"appid": "wxa5b486c6b918ecfb",
"projectname": "litemall-wx",
"appid": "wxa5b486c6b918ecfb",
"projectname": "litemall-wx",
"condition": {
"search": {
"current": -1,
......@@ -52,13 +52,13 @@
"id": -1,
"name": "专题评论列表",
"pathName": "pages/topicComment/topicComment",
"query": "valueId=314&typeId=1"
"query": "valueId=314&type=1"
},
{
"id": -1,
"name": "专题评论添加",
"pathName": "pages/topicCommentPost/topicCommentPost",
"query": "valueId=314&typeId=1"
"query": "valueId=314&type=1"
},
{
"id": -1,
......@@ -112,7 +112,7 @@
"id": -1,
"name": "商品评论列表",
"pathName": "pages/comment/comment",
"query": "valueId=1181000&typeId=0"
"query": "valueId=1181000&type=0"
},
{
"id": -1,
......@@ -163,16 +163,16 @@
"query": "id=1"
},
{
"id": -1,
"id": 22,
"name": "待评价的订单详情",
"pathName": "pages/ucenter/orderDetail/orderDetail",
"query": "id=24"
"query": "id=1"
},
{
"id": -1,
"name": "购买商品评价",
"pathName": "pages/commentPost/commentPost",
"query": "orderId=2&typeId=0&valueId=1116011"
"query": "orderId=2&type=0&valueId=1116011"
},
{
"id": -1,
......
Supports Markdown
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