theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Junling Bu
2018-07-05 22:43:16 +08:00
parent 936b551123
commit a86ec8b650
33 changed files with 129 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
View File

@@ -147,11 +147,13 @@ public class WxAuthController {
user.setWeixinOpenid(openId);
user.setAvatar(userInfo.getAvatarUrl());
user.setNickname(userInfo.getNickName());
user.setGender(userInfo.getGender() == 1 ? "男" : "女");
user.setUserLevel("普通用户");
user.setStatus("可用");
user.setGender(userInfo.getGender());
user.setUserLevel((byte)0);
user.setStatus((byte)0);
user.setLastLoginTime(LocalDateTime.now());
user.setLastLoginIp(IpUtil.client(request));
user.setAddTime(LocalDateTime.now());
userService.add(user);
}
else{
@@ -232,9 +234,9 @@ public class WxAuthController {
user.setWeixinOpenid("");
user.setAvatar("https://yanxuan.nosdn.127.net/80841d741d7fa3073e0ae27bf487339f.jpg?imageView&quality=90&thumbnail=64x64");
user.setNickname(username);
user.setGender("未知");
user.setUserLevel("普通用户");
user.setStatus("可用");
user.setGender((byte)0);
user.setUserLevel((byte)0);
user.setStatus((byte)0);
user.setLastLoginTime(LocalDateTime.now());
user.setLastLoginIp(IpUtil.client(request));
user.setAddTime(LocalDateTime.now());

60
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java
View File

@@ -65,10 +65,10 @@ public class WxCartController {
BigDecimal checkedGoodsAmount = new BigDecimal(0.00);
for (LitemallCart cart : cartList) {
goodsCount += cart.getNumber();
goodsAmount = goodsAmount.add(cart.getRetailPrice().multiply(new BigDecimal(cart.getNumber())));
goodsAmount = goodsAmount.add(cart.getPrice().multiply(new BigDecimal(cart.getNumber())));
if (cart.getChecked()) {
checkedGoodsCount += cart.getNumber();
checkedGoodsAmount = checkedGoodsAmount.add(cart.getRetailPrice().multiply(new BigDecimal(cart.getNumber())));
checkedGoodsAmount = checkedGoodsAmount.add(cart.getPrice().multiply(new BigDecimal(cart.getNumber())));
}
}
Map<String, Object> cartTotal = new HashMap<>();
@@ -127,32 +127,16 @@ public class WxCartController {
LitemallCart existCart = cartService.queryExist(goodsId, productId, userId);
if(existCart == null){
//取得规格的信息,判断规格库存
if(product == null || number > product.getGoodsNumber() ){
if(product == null || number > product.getNumber() ){
return ResponseUtil.fail(400, "库存不足");
}
Integer[] ids = product.getGoodsSpecificationIds();
String goodsSpecificationValue = null;
for(Integer id : ids){
LitemallGoodsSpecification goodsSpecification = goodsSpecificationService.findById(id);
if(goodsSpecification == null || !goodsSpecification.getGoodsId().equals(goodsId)){
return ResponseUtil.badArgument();
}
if(goodsSpecificationValue == null){
goodsSpecificationValue = goodsSpecification.getValue();
}
else {
goodsSpecificationValue = goodsSpecificationValue + " " + goodsSpecification.getValue();
}
}
cart.setId(null);
cart.setGoodsSn(goods.getGoodsSn());
cart.setGoodsName((goods.getName()));
cart.setPicUrl(goods.getPrimaryPicUrl());
cart.setRetailPrice(product.getRetailPrice());
cart.setGoodsSpecificationIds(product.getGoodsSpecificationIds());
cart.setGoodsSpecificationValues(goodsSpecificationValue);
cart.setPicUrl(goods.getPicUrl());
cart.setPrice(product.getPrice());
cart.setSpecifications(product.getSpecifications());
cart.setUserId(userId);
cart.setChecked(true);
cartService.add(cart);
@@ -160,7 +144,7 @@ public class WxCartController {
else{
//取得规格的信息,判断规格库存
int num = existCart.getNumber() + number;
if(num > product.getGoodsNumber()){
if(num > product.getNumber()){
return ResponseUtil.fail(400, "库存不足");
}
existCart.setNumber((short)num);
@@ -215,32 +199,16 @@ public class WxCartController {
LitemallCart existCart = cartService.queryExist(goodsId, productId, userId);
if(existCart == null){
//取得规格的信息,判断规格库存
if(product == null || number > product.getGoodsNumber() ){
if(product == null || number > product.getNumber() ){
return ResponseUtil.fail(400, "库存不足");
}
Integer[] ids = product.getGoodsSpecificationIds();
String goodsSpecificationValue = null;
for(Integer id : ids){
LitemallGoodsSpecification goodsSpecification = goodsSpecificationService.findById(id);
if(goodsSpecification == null || !goodsSpecification.getGoodsId().equals(goodsId)){
return ResponseUtil.badArgument();
}
if(goodsSpecificationValue == null){
goodsSpecificationValue = goodsSpecification.getValue();
}
else {
goodsSpecificationValue = goodsSpecificationValue + " " + goodsSpecification.getValue();
}
}
cart.setId(null);
cart.setGoodsSn(goods.getGoodsSn());
cart.setGoodsName((goods.getName()));
cart.setPicUrl(goods.getPrimaryPicUrl());
cart.setRetailPrice(product.getRetailPrice());
cart.setGoodsSpecificationIds(product.getGoodsSpecificationIds());
cart.setGoodsSpecificationValues(goodsSpecificationValue);
cart.setPicUrl(goods.getPicUrl());
cart.setPrice(product.getPrice());
cart.setSpecifications(product.getSpecifications());
cart.setUserId(userId);
cart.setChecked(true);
cartService.add(cart);
@@ -248,7 +216,7 @@ public class WxCartController {
else{
//取得规格的信息,判断规格库存
int num = number;
if(num > product.getGoodsNumber()){
if(num > product.getNumber()){
return ResponseUtil.fail(400, "库存不足");
}
existCart.setNumber((short)num);
@@ -307,7 +275,7 @@ public class WxCartController {
//取得规格的信息,判断规格库存
LitemallProduct product = productService.findById(productId);
if(product == null || product.getGoodsNumber() < number){
if(product == null || product.getNumber() < number){
return ResponseUtil.fail(403, "库存不足");
}
@@ -498,7 +466,7 @@ public class WxCartController {
}
BigDecimal checkedGoodsPrice = new BigDecimal(0.00);
for (LitemallCart cart : checkedGoodsList) {
checkedGoodsPrice = checkedGoodsPrice.add(cart.getRetailPrice().multiply(new BigDecimal(cart.getNumber())));
checkedGoodsPrice = checkedGoodsPrice.add(cart.getPrice().multiply(new BigDecimal(cart.getNumber())));
}
// 根据订单商品总价计算运费，满88则免运费，否则8元；

24
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java
View File

@@ -29,7 +29,7 @@ public class WxCollectController {
* 用户收藏列表
*
* @param userId 用户ID
* @param typeId 类型ID
* @param type 类型，如果是0则是商品收藏，如果是1则是专题收藏
* 目前没有使用
* @param page 分页页数
* @param size 分页大小
@@ -47,31 +47,31 @@ public class WxCollectController {
* 失败则 { errno: XXX, errmsg: XXX }
*/
@GetMapping("list")
public Object list(@LoginUser Integer userId, Integer typeId,
public Object list(@LoginUser Integer userId, Byte type,
@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "size", defaultValue = "10") Integer size) {
if(userId == null){
return ResponseUtil.unlogin();
}
if(typeId == null){
if(type == null){
return ResponseUtil.badArgument();
}
List<LitemallCollect> collectList = collectService.queryByType(userId, typeId, page, size);
int count = collectService.countByType(userId, typeId);
List<LitemallCollect> collectList = collectService.queryByType(userId, type, page, size);
int count = collectService.countByType(userId, type);
int totalPages = (int) Math.ceil((double) count / size);
List<Object> collects = new ArrayList<>(collectList.size());
for(LitemallCollect collect : collectList){
Map<String, Object> c = new HashMap();
c.put("id", collect.getId());
c.put("typeId", collect.getTypeId());
c.put("type", collect.getType());
c.put("valueId", collect.getValueId());
LitemallGoods goods = goodsService.findById(collect.getValueId());
c.put("name", goods.getName());
c.put("goodsBrief", goods.getGoodsBrief());
c.put("listPicUrl", goods.getListPicUrl());
c.put("brief", goods.getBrief());
c.put("picUrl", goods.getPicUrl());
c.put("retailPrice", goods.getRetailPrice());
collects.add(c);
@@ -109,13 +109,13 @@ public class WxCollectController {
return ResponseUtil.badArgument();
}
Integer typeId = JacksonUtil.parseInteger(body, "typeId");
Byte type = JacksonUtil.parseByte(body, "type");
Integer valueId = JacksonUtil.parseInteger(body, "valueId");
if(!ObjectUtils.allNotNull(typeId, valueId)){
if(!ObjectUtils.allNotNull(type, valueId)){
return ResponseUtil.badArgument();
}
LitemallCollect collect = collectService.queryByTypeAndValue(userId, typeId, valueId);
LitemallCollect collect = collectService.queryByTypeAndValue(userId, type, valueId);
String handleType = null;
if(collect != null){
@@ -127,7 +127,7 @@ public class WxCollectController {
collect = new LitemallCollect();
collect.setUserId(userId);
collect.setValueId(valueId);
collect.setTypeId(typeId);
collect.setType(type);
collect.setAddTime(LocalDateTime.now());
collectService.add(collect);
}

22
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java
View File

@@ -66,8 +66,8 @@ public class WxCommentController {
/**
* 评论数量
*
* @param typeId 类型ID。 如果是0，则查询商品评论；如果是1，则查询专题评论。
* @param valueId 商品或专题ID。如果typeId是0，则是商品ID；如果typeId是1，则是专题ID。
* @param type 类型ID。 如果是0，则查询商品评论；如果是1，则查询专题评论。
* @param valueId 商品或专题ID。如果type是0，则是商品ID；如果type是1，则是专题ID。
* @return 评论数量
* 成功则
* {
@@ -82,9 +82,9 @@ public class WxCommentController {
* 失败则 { errno: XXX, errmsg: XXX }
*/
@GetMapping("count")
public Object count(Byte typeId, Integer valueId) {
int allCount = commentService.count(typeId, valueId, 0, 0, 0);
int hasPicCount = commentService.count(typeId, valueId, 1, 0, 0);
public Object count(Byte type, Integer valueId) {
int allCount = commentService.count(type, valueId, 0, 0, 0);
int hasPicCount = commentService.count(type, valueId, 1, 0, 0);
Map<String, Object> data = new HashMap();
data.put("allCount", allCount);
data.put("hasPicCount", hasPicCount);
@@ -94,8 +94,8 @@ public class WxCommentController {
/**
* 评论列表
*
* @param typeId 类型ID。 如果是0，则查询商品评论；如果是1，则查询专题评论。
* @param valueId 商品或专题ID。如果typeId是0，则是商品ID；如果typeId是1，则是专题ID。
* @param type 类型ID。 如果是0，则查询商品评论；如果是1，则查询专题评论。
* @param valueId 商品或专题ID。如果type是0，则是商品ID；如果type是1，则是专题ID。
* @param showType 显示类型。如果是0，则查询全部；如果是1，则查询有图片的评论。
* @param page 分页页数
* @param size 分页大小
@@ -114,15 +114,15 @@ public class WxCommentController {
* 失败则 { errno: XXX, errmsg: XXX }
*/
@GetMapping("list")
public Object list(Byte typeId, Integer valueId, Integer showType,
public Object list(Byte type, Integer valueId, Integer showType,
@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "size", defaultValue = "10") Integer size) {
if(!ObjectUtils.allNotNull(typeId, valueId, showType)){
if(!ObjectUtils.allNotNull(type, valueId, showType)){
return ResponseUtil.badArgument();
}
List<LitemallComment> commentList = commentService.query(typeId, valueId, showType, page, size);
int count = commentService.count(typeId, valueId, showType, page, size);
List<LitemallComment> commentList = commentService.query(type, valueId, showType, page, size);
int count = commentService.count(type, valueId, showType, page, size);
List<Map<String, Object>> commentVoList = new ArrayList<>(commentList.size());
for(LitemallComment comment : commentList){

4
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java
View File

@@ -97,8 +97,8 @@ public class WxFootprintController {
LitemallGoods goods = goodsService.findById(footprint.getGoodsId());
c.put("name", goods.getName());
c.put("goodsBrief", goods.getGoodsBrief());
c.put("listPicUrl", goods.getListPicUrl());
c.put("brief", goods.getBrief());
c.put("picUrl", goods.getPicUrl());
c.put("retailPrice", goods.getRetailPrice());
footprintVoList.add(c);

6
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
View File

@@ -182,14 +182,14 @@ public class WxGoodsController {
LitemallCategory parent = null;
List<LitemallCategory> children = null;
if(cur.getParentId() == 0){
if(cur.getPid() == 0){
parent = cur;
children = categoryService.queryByPid(cur.getId());
cur = children.get(0);
}
else{
parent = categoryService.findById(cur.getParentId());
children = categoryService.queryByPid(cur.getParentId());
parent = categoryService.findById(cur.getPid());
children = categoryService.queryByPid(cur.getPid());
}
Map<String, Object> data = new HashMap<>();
data.put("currentCategory", cur);

2
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
View File

@@ -57,7 +57,7 @@ public class WxHomeController {
public Object index() {
Map<String, Object> data = new HashMap<>();
List<LitemallAd> banner = adService.queryByApid(1);
List<LitemallAd> banner = adService.queryIndex();
data.put("banner", banner);
List<LitemallCategory> channel = categoryService.queryChannel();

19
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
View File

@@ -222,9 +222,9 @@ public class WxOrderController {
orderGoodsVo.put("goodsId", orderGoods.getGoodsId());
orderGoodsVo.put("goodsName", orderGoods.getGoodsName());
orderGoodsVo.put("number", orderGoods.getNumber());
orderGoodsVo.put("retailPrice", orderGoods.getRetailPrice());
orderGoodsVo.put("retailPrice", orderGoods.getPrice());
orderGoodsVo.put("picUrl", orderGoods.getPicUrl());
orderGoodsVo.put("goodsSpecificationValues", orderGoods.getGoodsSpecificationValues());
orderGoodsVo.put("goodsSpecificationValues", orderGoods.getSpecifications());
orderGoodsVoList.add(orderGoodsVo);
}
@@ -284,7 +284,7 @@ public class WxOrderController {
}
BigDecimal checkedGoodsPrice = new BigDecimal(0.00);
for (LitemallCart checkGoods : checkedGoodsList) {
checkedGoodsPrice = checkedGoodsPrice.add(checkGoods.getRetailPrice().multiply(new BigDecimal(checkGoods.getNumber())));
checkedGoodsPrice = checkedGoodsPrice.add(checkGoods.getPrice().multiply(new BigDecimal(checkGoods.getNumber())));
}
// 根据订单商品总价计算运费，满88则免运费，否则8元；
@@ -337,10 +337,9 @@ public class WxOrderController {
orderGoods.setProductId(cartGoods.getProductId());
orderGoods.setGoodsName(cartGoods.getGoodsName());
orderGoods.setPicUrl(cartGoods.getPicUrl());
orderGoods.setRetailPrice(cartGoods.getRetailPrice());
orderGoods.setPrice(cartGoods.getPrice());
orderGoods.setNumber(cartGoods.getNumber());
orderGoods.setGoodsSpecificationIds(cartGoods.getGoodsSpecificationIds());
orderGoods.setGoodsSpecificationValues(cartGoods.getGoodsSpecificationValues());
orderGoods.setSpecifications(cartGoods.getSpecifications());
orderGoods.setAddTime(LocalDateTime.now());
// 添加订单商品表项
@@ -355,11 +354,11 @@ public class WxOrderController {
Integer productId = checkGoods.getProductId();
LitemallProduct product = productService.findById(productId);
Integer remainNumber = product.getGoodsNumber() - checkGoods.getNumber();
Integer remainNumber = product.getNumber() - checkGoods.getNumber();
if (remainNumber < 0) {
throw new RuntimeException("下单的商品货品数量大于库存量");
}
product.setGoodsNumber(remainNumber);
product.setNumber(remainNumber);
productService.updateById(product);
}
} catch (Exception ex) {
@@ -425,8 +424,8 @@ public class WxOrderController {
for (LitemallOrderGoods orderGoods : orderGoodsList) {
Integer productId = orderGoods.getProductId();
LitemallProduct product = productService.findById(productId);
Integer number = product.getGoodsNumber() + orderGoods.getNumber();
product.setGoodsNumber(number);
Integer number = product.getNumber() + orderGoods.getNumber();
product.setNumber(number);
productService.updateById(product);
}
} catch (Exception ex) {

6
litemall-wx/app.json
View File

@@ -4,7 +4,7 @@
"pages/catalog/catalog",
"pages/newGoods/newGoods",
"pages/hotGoods/hotGoods",
"pages/ucenter/index/index",
"pages/ucenter/index/index",
"pages/ucenter/address/address",
"pages/ucenter/addressAdd/addressAdd",
"pages/ucenter/footprint/footprint",
@@ -18,10 +18,10 @@
"pages/payResult/payResult",
"pages/comment/comment",
"pages/commentPost/commentPost",
"pages/topic/topic",
"pages/topic/topic",
"pages/topicComment/topicComment",
"pages/topicDetail/topicDetail",
"pages/topicCommentPost/topicCommentPost",
"pages/topicCommentPost/topicCommentPost",
"pages/brand/brand",
"pages/brandDetail/brandDetail",
"pages/search/search",

2
litemall-wx/pages/brand/brand.wxml
View File

@@ -2,7 +2,7 @@
<view class="brand-list" >
<navigator url="../brandDetail/brandDetail?id={{item.id}}" class="item" wx:for="{{brandList}}" wx:key="id">
<view class="img-bg">
<image src="{{item.appListPicUrl}}" background-size="cover"></image>
<image src="{{item.picUrl}}" background-size="cover"></image>
</view>
<view class="txt-box">
<view class="line">

6
litemall-wx/pages/brandDetail/brandDetail.wxml
View File

@@ -1,7 +1,7 @@
<view class="container">
<view class="brand-info">
<view class="name">
<image class="img" src="{{brand.appListPicUrl}}" background-size="cover"></image>
<image class="img" src="{{brand.picUrl}}" background-size="cover"></image>
<view class="info-box">
<view class="info">
<text class="txt">{{brand.name}}</text>
@@ -10,7 +10,7 @@
</view>
</view>
<view class="desc">
{{brand.simpleDesc}}
{{brand.desc}}
</view>
</view>
@@ -18,7 +18,7 @@
<view class="b">
<block wx:for="{{goodsList}}" wx:key="id" wx:for-index="iindex" wx:for-item="iitem">
<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>

2
litemall-wx/pages/cart/cart.wxml
View File

@@ -33,7 +33,7 @@
</view>
<view class="attr">{{ isEditCart ? '已选择:' : ''}}{{item.goodsSpecificationValues||''}}</view>
<view class="b">
<text class="price">￥{{item.retailPrice}}</text>
<text class="price">￥{{item.price}}</text>
<view class="selnum">
<view class="cut" bindtap="cutNumber" data-item-index="{{index}}">-</view>
<input value="{{item.number}}" class="number" disabled="true" type="number" />

4
litemall-wx/pages/catalog/catalog.wxml
View File

@@ -11,7 +11,7 @@
</scroll-view>
<scroll-view class="cate" scroll-y="true">
<navigator url="url" class="banner">
<image class="image" src="{{currentCategory.wapBannerUrl}}"></image>
<image class="image" src="{{currentCategory.picUrl}}"></image>
<view class="txt">{{currentCategory.frontName}}</view>
</navigator>
<view class="hd">
@@ -21,7 +21,7 @@
</view>
<view class="bd">
<navigator url="/pages/category/category?id={{item.id}}" class="item {{(index+1) % 3 == 0 ? 'last' : ''}}" wx:key="id" wx:for="{{currentSubCategoryList}}">
<image class="icon" src="{{item.wapBannerUrl}}"></image>
<image class="icon" src="{{item.picUrl}}"></image>
<text class="txt">{{item.name}}</text>
</navigator>
</view>

2
litemall-wx/pages/category/category.wxml
View File

@@ -15,7 +15,7 @@
</view>
<view class="b">
<navigator class="item {{(iindex + 1) % 2 == 0 ? 'item-b' : ''}}" url="/pages/goods/goods?id={{iitem.id}}" wx:for="{{goodsList}}" wx:key="id" wx:for-item="iitem" wx:for-index="iindex" >
<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>

8
litemall-wx/pages/comment/comment.js
View File

@@ -7,7 +7,7 @@ Page({
comments: [],
allCommentList: [],
picCommentList: [],
typeId: 0,
type: 0,
valueId: 0,
showType: 0,
allCount: 0,
@@ -18,7 +18,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({
allCount: res.data.allCount,
@@ -31,7 +31,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
@@ -57,7 +57,7 @@ Page({
onLoad: function (options) {
// 页面初始化 options为页面跳转所带来的参数
this.setData({
typeId: options.typeId,
type: options.type,
valueId: options.valueId
});
this.getCommentCount();

6
litemall-wx/pages/commentPost/commentPost.js
View File

@@ -5,7 +5,7 @@ var api = require('../../config/api.js');
Page({
data: {
orderId: 0,
typeId: 0,
type: 0,
valueId: 0,
orderGoods: {},
content: '',
@@ -102,7 +102,7 @@ Page({
var that = this;
that.setData({
orderId: options.orderId,
typeId: options.typeId,
type: options.type,
valueId: options.valueId
});
this.getOrderComment();
@@ -131,7 +131,7 @@ Page({
}
util.request(api.CommentPost, {
typeId: that.data.typeId,
type: that.data.type,
valueId: that.data.valueId,
content: that.data.content,
star: that.data.star,

18
litemall-wx/pages/goods/goods.js
View File

@@ -40,7 +40,7 @@ Page({
// 如果仅仅存在一种货品，那么商品价格应该和货品价格一致
// 这里检测一下
let _productPrice = res.data.productList[0].retailPrice;
let _productPrice = res.data.productList[0].price;
let _goodsPrice = res.data.info.retailPrice;
if (_productPrice != _goodsPrice){
console.error('商品数量价格和货品不一致');
@@ -75,7 +75,7 @@ Page({
});
}
WxParse.wxParse('goodsDetail', 'html', res.data.info.goodsDesc, that);
WxParse.wxParse('goodsDetail', 'html', res.data.info.desc, that);
that.getGoodsRelated();
}
@@ -161,7 +161,7 @@ Page({
},
getCheckedSpecKey: function () {
let checkedValue = this.getCheckedSpecValue().map(function (v) {
return v.valueId;
return v.valueText;
});
return checkedValue;
@@ -206,9 +206,9 @@ Page({
}
let checkedProduct = checkedProductArray[0];
if (checkedProduct.goodsNumber > 0){
if (checkedProduct.number > 0){
this.setData({
checkedSpecPrice: checkedProduct.retailPrice,
checkedSpecPrice: checkedProduct.price,
soldout: false
});
}
@@ -231,7 +231,7 @@ Page({
},
getCheckedProductItem: function (key) {
return this.data.productList.filter(function (v) {
if (v.goodsSpecificationIds.toString() == key.toString()) {
if (v.specifications.toString() == key.toString()) {
return true;
} else {
return false;
@@ -293,7 +293,7 @@ Page({
}
} else {
//添加或是取消收藏
util.request(api.CollectAddOrDelete, { typeId: 0, valueId: this.data.id }, "POST")
util.request(api.CollectAddOrDelete, { type: 0, valueId: this.data.id }, "POST")
.then(function (res) {
let _res = res;
if (_res.errno == 0) {
@@ -354,7 +354,7 @@ Page({
let checkedProduct = checkedProductArray[0];
//验证库存
if (checkedProduct.goodsNumber <= 0) {
if (checkedProduct.number <= 0) {
wx.showToast({
image: '/static/images/icon_error.png',
title: '没有库存'
@@ -420,7 +420,7 @@ Page({
let checkedProduct = checkedProductArray[0];
//验证库存
if (checkedProduct.goodsNumber <= 0) {
if (checkedProduct.number <= 0) {
wx.showToast({
image: '/static/images/icon_error.png',
title: '没有库存'

6
litemall-wx/pages/goods/goods.wxml
View File

@@ -28,7 +28,7 @@
</view>
<view class="comments" wx:if="{{comment.count > 0}}">
<view class="h">
<navigator url="/pages/comment/comment?valueId={{goods.id}}&typeId=0">
<navigator url="/pages/comment/comment?valueId={{goods.id}}&type=0">
<text class="t">评价({{comment.count > 999 ? '999+' : comment.count}})</text>
<text class="i">查看全部</text>
</navigator>
@@ -92,7 +92,7 @@
<view class="b">
<view class="item" wx:for="{{relatedGoods}}" wx:key="id">
<navigator url="/pages/goods/goods?id={{item.id}}">
<image class="img" src="{{item.listPicUrl}}" background-size="cover"></image>
<image class="img" src="{{item.picUrl}}" background-size="cover"></image>
<text class="name">{{item.name}}</text>
<text class="price">￥{{item.retailPrice}}</text>
</navigator>
@@ -102,7 +102,7 @@
</view>
<view wx:if="{{openAttr}}" class="attr-pop">
<view class="img-info">
<image class="img" src="{{goods.primaryPicUrl}}"></image>
<image class="img" src="{{goods.picUrl}}"></image>
<view class="info">
<view class="c">
<view class="p">价格：￥{{checkedSpecPrice}}</view>

2
litemall-wx/pages/hotGoods/hotGoods.wxml
View File

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

12
litemall-wx/pages/index/index.wxml
View File

@@ -46,7 +46,7 @@
<view class="b">
<view class="item" wx:for="{{newGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
<navigator url="../goods/goods?id={{item.id}}">
<image class="img" src="{{item.listPicUrl}}" background-size="cover"></image>
<image class="img" src="{{item.picUrl}}" background-size="cover"></image>
<text class="name">{{item.name}}</text>
<text class="price">￥{{item.retailPrice}}</text>
</navigator>
@@ -64,11 +64,11 @@
<view class="b">
<view class="item" wx:for="{{hotGoods}}" wx:for-index="index" wx:for-item="item" wx:key="id">
<navigator url="/pages/goods/goods?id={{item.id}}">
<image class="img" src="{{item.listPicUrl}}" background-size="cover"></image>
<image class="img" src="{{item.picUrl}}" background-size="cover"></image>
<view class="right">
<view class="text">
<text class="name">{{item.name}}</text>
<text class="desc">{{item.goods_brief}}</text>
<text class="desc">{{item.brief}}</text>
<text class="price">￥{{item.retailPrice}}</text>
</view>
</view>
@@ -88,10 +88,10 @@
<scroll-view scroll-x class="list">
<view class="item" wx:for="{{topics}}" wx:for-index="index" wx:for-item="item" wx:key="id">
<navigator url="../topicDetail/topicDetail?id={{item.id}}">
<image class="img" src="{{item.scenePicUrl}}" background-size="cover"></image>
<image class="img" src="{{item.picUrl}}" background-size="cover"></image>
<view class="np">
<text class="name">{{item.title}}</text>
<text class="price">￥{{item.priceInfo}}元起</text>
<text class="price">￥{{item.price}}元起</text>
</view>
<text class="desc">{{item.subtitle}}</text>
</navigator>
@@ -109,7 +109,7 @@
<block wx:for="{{item.goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
<view class="item {{iindex % 2 == 0 ? '' : 'item-b'}}">
<navigator url="../goods/goods?id={{iitem.id}}" class="a">
<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>

4
litemall-wx/pages/index/index.wxss
View File

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

2
litemall-wx/pages/newGoods/newGoods.wxml
View File

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

4
litemall-wx/pages/topic/topic.wxml
View File

@@ -1,11 +1,11 @@
<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}}">

8
litemall-wx/pages/topicComment/topicComment.js
View File

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

4
litemall-wx/pages/topicCommentPost/topicCommentPost.js
View File

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

2
litemall-wx/pages/topicCommentPost/topicCommentPost.wxml
View File

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

4
litemall-wx/pages/topicDetail/topicDetail.js
View File

@@ -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',
})
}
},

4
litemall-wx/pages/topicDetail/topicDetail.wxml
View File

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

6
litemall-wx/pages/ucenter/collect/collect.js
View File

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

4
litemall-wx/pages/ucenter/collect/collect.wxml
View File

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

4
litemall-wx/pages/ucenter/footprint/footprint.wxml
View File

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

2
litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
View File

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

16
litemall-wx/project.config.json
View File

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