From 19e2d028c3f30d3a2ccac71d303ad170259477e8 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 21 Nov 2018 17:55:33 +0800 Subject: [PATCH] cart --- alipay/app.acss | 19 +- alipay/images/address-select-active-icon.png | Bin 5794 -> 0 bytes alipay/images/address-select-icon.png | Bin 5225 -> 0 bytes alipay/images/default-cart-empty.png | Bin 0 -> 5608 bytes alipay/images/default-select-active-icon.png | Bin 0 -> 3929 bytes alipay/images/default-select-icon.png | Bin 0 -> 4792 bytes alipay/pages/cart/cart.acss | 78 +++++++- alipay/pages/cart/cart.axml | 93 ++++++--- alipay/pages/cart/cart.js | 188 +++++++++++++++++- alipay/pages/cart/cart.json | 6 +- .../goods-attribute/goods-attribute.axml | 2 +- .../pages/goods-category/goods-category.axml | 2 +- alipay/pages/goods-category/goods-category.js | 9 +- alipay/pages/goods-detail/goods-detail.acss | 6 +- alipay/pages/goods-detail/goods-detail.axml | 3 +- alipay/pages/goods-detail/goods-detail.js | 115 +++++++++-- alipay/pages/goods-search/goods-search.axml | 6 +- alipay/pages/user-address/user-address.axml | 4 +- .../Controller/GoodsController.class.php | 2 +- .../Application/Admin/Lang/zh-cn/goods.php | 2 +- .../Admin/View/Default/Goods/Index.html | 4 +- .../Admin/View/Default/Goods/SaveInfo.html | 2 +- .../Api/Controller/CartController.class.php | 3 +- .../Api/Controller/GoodsController.class.php | 188 +++--------------- .../Home/View/Default/Cart/Index.html | 5 +- .../Application/Service/BuyService.class.php | 30 +-- .../Service/GoodsService.class.php | 48 ++++- 27 files changed, 547 insertions(+), 268 deletions(-) delete mode 100755 alipay/images/address-select-active-icon.png delete mode 100755 alipay/images/address-select-icon.png create mode 100644 alipay/images/default-cart-empty.png create mode 100644 alipay/images/default-select-active-icon.png create mode 100644 alipay/images/default-select-icon.png diff --git a/alipay/app.acss b/alipay/app.acss index c5895806b..56008a9f0 100755 --- a/alipay/app.acss +++ b/alipay/app.acss @@ -205,14 +205,23 @@ textarea { width: 100%; } +.bg-main, .bg-primary, .bg-warning { + color: #fff; + border: 0; + font-size: 34rpx; +} .bg-main { - background: #d2364c; - color: #fff; - border: 0; + background: #d2364c; +} +.bg-primary { + background: #ed6977; +} +.bg-warning { + background: #F37B1D; } .bg-active-main { - background: #d2364c !important; - color: #fff !important; + background: #d2364c !important; + color: #fff !important; } .submit-bottom { diff --git a/alipay/images/address-select-active-icon.png b/alipay/images/address-select-active-icon.png deleted file mode 100755 index 1e0624d6580ce19d7c51abc00075cd4bcc3b78e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5794 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 diff --git a/alipay/images/address-select-icon.png b/alipay/images/address-select-icon.png deleted file mode 100755 index 5b5e42b504926da2b04647d8ac9a705d5b67cbaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5225 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 G=Klces(}vx diff --git a/alipay/images/default-cart-empty.png b/alipay/images/default-cart-empty.png new file mode 100644 index 0000000000000000000000000000000000000000..b7a0596c29b5f007a45a7317bab51ad79ec5a344 GIT binary patch literal 5608 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 literal 0 HcmV?d00001 diff --git a/alipay/images/default-select-active-icon.png b/alipay/images/default-select-active-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..12dfcfe38fd367dbdfacf592b0a9e759555e4239 GIT binary patch literal 3929 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 literal 0 HcmV?d00001 diff --git a/alipay/images/default-select-icon.png b/alipay/images/default-select-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..466c0ebc07c2a75a71ceb7b305e7000e1093b01b GIT binary patch literal 4792 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 literal 0 HcmV?d00001 diff --git a/alipay/pages/cart/cart.acss b/alipay/pages/cart/cart.acss index 54933fa5b..b6a71e18b 100644 --- a/alipay/pages/cart/cart.acss +++ b/alipay/pages/cart/cart.acss @@ -1,13 +1,16 @@ /** * 商品列表 */ -.goods-title { - line-height: 36rpx; + .page { + padding-bottom: 120rpx; } .goods-item { padding: 20rpx 10rpx; position: relative; } +.goods-title { + line-height: 36rpx; +} .goods-item:not(:last-child) { border-bottom: 1px solid #eee; } @@ -28,6 +31,12 @@ .buy-number { margin-left: 20rpx; } +.goods-item .items { + padding-left: 80rpx; +} +.goods-item .selected { + margin-top: 60rpx; +} /** * 数量操作 @@ -35,7 +44,7 @@ .number-content { position: absolute; right: 20rpx; - top: 120rpx; + top: 100rpx; } .number-content button { @@ -57,4 +66,67 @@ { border: 1px solid #ddd; padding: 0; +} + +/** + * 空购物车 + */ +.no-data-box { + padding: 30% 0 0 0; +} +.no-data-box image { + width: 160rpx; + margin-bottom: 20rpx; +} +.no-data-box .no-data-tips { + font-size: 28rpx; + color: #a6a6a6; +} +.no-data-box button { + margin: 0 auto; + width: 220rpx; + height: 60rpx; + line-height: 60rpx; + font-size: 28rpx; + margin-top: 30rpx; +} + +/** + * 操作导航 + */ +.buy-nav { + position: fixed; + left: 0; + bottom: 0; +} +.buy-nav, .nav-base, .nav-submit button { + height: 100rpx; +} +.nav-base, .nav-submit button { + line-height: 100rpx; +} +.nav-base { + width: calc(75% - 20rpx); + padding: 0 10rpx; +} +.nav-submit { + width: 25%; +} +.nav-submit button { + border-radius: 0; +} +.page { + padding-bottom: 120rpx; +} +.selected .icon { + width: 50rpx; + height: 50rpx !important; + margin: 0 10rpx; + vertical-align: middle; +} +.buy-nav .price { + width: calc(100% - 140rpx); +} +.buy-nav .sales-price { + max-width: calc(100% - 40px); } \ No newline at end of file diff --git a/alipay/pages/cart/cart.axml b/alipay/pages/cart/cart.axml index ed624547a..ced969448 100644 --- a/alipay/pages/cart/cart.axml +++ b/alipay/pages/cart/cart.axml @@ -1,29 +1,72 @@ - - - - - - - - - {{item.title}} - - - {{attr.attr_type_name}}:{{attr.attr_name}} + + + + + + + - - - - - - - + + + + + + + + + + {{item.title}} + + + {{attr.attr_type_name}}:{{attr.attr_name}} + + + + + + + + + + + + ￥{{item.price}} + ￥{{item.original_price}} + x{{item.stock}} + + + - - - ￥{{item.price}} - ￥{{item.original_price}} - x{{item.stock}} + + + + + + + 全选 + + + ￥{{total_price}} + 合计： + + + + + - \ No newline at end of file + + + + + 购物车空空如也 + + + + + + + + \ No newline at end of file diff --git a/alipay/pages/cart/cart.js b/alipay/pages/cart/cart.js index f296880c2..5e7d51141 100644 --- a/alipay/pages/cart/cart.js +++ b/alipay/pages/cart/cart.js @@ -5,7 +5,9 @@ Page({ data_list_loding_msg: '', data_bottom_line_status: false, data_list: [], - value: 8, + swipe_index: null, + total_price: 0, + is_selected_all: false, }, onShow() { @@ -13,7 +15,33 @@ Page({ this.init(); }, - init() { + init(e) { + var user = app.GetUserInfo(this, "init"); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if ((user.mobile || null) == null) { + my.confirm({ + title: '温馨提示', + content: '绑定手机号码', + confirmButtonText: '确认', + cancelButtonText: '暂不', + success: (result) => { + if (result.confirm) { + my.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + this.get_data(); + }, + }); + } else { + this.get_data(); + } + } + }, + + // 获取数据 + get_data() { this.setData({ data_list_loding_status: 1 }); @@ -25,15 +53,21 @@ Page({ dataType: "json", success: res => { my.stopPullDownRefresh(); - if (res.data.code == 0) { + if (res.data.code == 0) { + var data = res.data.data; + if (data.length > 0) { + for (var i in data) { + data[i]['right'] = [{ type: 'edit', text: '收藏' }, { type: 'delete', text: '删除' }]; + } + } this.setData({ - data_list: res.data.data, - data_list_loding_status: 3, + data_list: data, + data_list_loding_status: data.length == 0 ? 0 : 3, data_bottom_line_status: true, data_list_loding_msg: '', }); } else { - self.setData({ + this.setData({ data_list_loding_status: 2, data_bottom_line_status: false, data_list_loding_msg: res.data.msg, @@ -46,7 +80,7 @@ Page({ }, fail: () => { my.stopPullDownRefresh(); - self.setData({ + this.setData({ data_list_loding_status: 2, data_bottom_line_status: false, data_list_loding_msg: '服务器请求出错', @@ -88,10 +122,10 @@ Page({ // 数量处理方法 goods_buy_number_func(index, buy_number) { var temp_data_list = this.data.data_list; - var buy_min_number = parseInt(temp_data_list['buy_min_number']) || 1; - var buy_max_number = parseInt(temp_data_list['buy_max_number']) || 0; - var inventory = parseInt(temp_data_list['inventory']); - var inventory_unit = temp_data_list['inventory_unit']; + var buy_min_number = parseInt(temp_data_list[index]['buy_min_number']) || 1; + var buy_max_number = parseInt(temp_data_list[index]['buy_max_number']) || 0; + var inventory = parseInt(temp_data_list[index]['inventory']); + var inventory_unit = temp_data_list[index]['inventory_unit']; if (buy_number < buy_min_number) { buy_number = buy_min_number; if (buy_min_number > 1) { @@ -142,4 +176,136 @@ Page({ }); }, + // 滑动操作 + right_item_event(e) { + var type = e.detail.type; + var index = e.extra; + var id = this.data.data_list[index]['id']; + var goods_id = this.data.data_list[index]['goods_id']; + + // 收藏 + if (type == 'edit') { + this.goods_favor_event(id, goods_id, type); + } else { + my.confirm({ + title: '温馨提示', + content: '删除后不可恢复，确定继续吗？', + confirmButtonText: '确定', + cancelButtonText: '取消', + success: (result) => { + if (result.confirm) { + this.cart_delete(id, type); + } else { + this.setData({ swipe_index: null }); + } + } + }); + } + }, + + // 滑动操作 + swipe_start_event(e) { + this.setData({ swipe_index: e.index }); + }, + + // 收藏事件 + goods_favor_event(id, goods_id, type) { + my.httpRequest({ + url: app.get_request_url('Favor', 'Goods'), + method: 'POST', + data: { "id": goods_id, "is_mandatory_favor": 1 }, + dataType: 'json', + success: (res) => { + if (res.data.code == 0) { + this.cart_delete(id, type); + } else { + my.showToast({ + type: 'fail', + content: res.data.msg + }); + } + }, + fail: () => { + my.showToast({ + type: 'fail', + content: '服务器请求出错' + }); + } + }); + }, + + // 购物车删除 + cart_delete(id, type) { + my.httpRequest({ + url: app.get_request_url('Delete', 'Cart'), + method: 'POST', + data: { "id": id }, + dataType: 'json', + success: (res) => { + if (res.data.code == 0) { + var temp_data_list = this.data.data_list; + temp_data_list.splice(this.data.swipe_index, 1); + this.setData({ + data_list: temp_data_list, + swipe_index: null, + data_list_loding_status: temp_data_list.length == 0 ? 0 : this.data.data_list_loding_status, + }); + + my.showToast({ + type: 'success', + content: (type == 'delete') ? '删除成功' : '收藏成功' + }); + } else { + my.showToast({ + type: 'fail', + content: (type == 'delete') ? '删除失败' : '收藏失败' + }); + } + }, + fail: () => { + my.showToast({ + type: 'fail', + content: '服务器请求出错' + }); + } + }); + }, + + // 选中处理 + selectedt_event(e) { + var type = e.currentTarget.dataset.type || null; + + if (type != null) + { + var temp_data_list = this.data.data_list; + var temp_is_selected_all = this.data.is_selected_all; + var total_price = 0; + switch(type) { + case 'all' : + temp_is_selected_all = (temp_is_selected_all == true) ? false : true; + for (var i in temp_data_list) { + temp_data_list[i]['selected'] = temp_is_selected_all; + } + break; + + case 'node' : + var index = e.currentTarget.dataset.index || 0; + temp_data_list[index]['selected'] = (temp_data_list[index]['selected'] == true) ? false : true; + break; + } + + for (var i in temp_data_list) { + if ((temp_data_list[i]['selected'] || false) == true) { + total_price += temp_data_list[i]['stock'] * temp_data_list[i]['price']; + } + } + + this.setData({ + data_list: temp_data_list, + is_selected_all: temp_is_selected_all, + total_price: total_price.toFixed(2), + }) + } + } + }); diff --git a/alipay/pages/cart/cart.json b/alipay/pages/cart/cart.json index c96031fd7..43d0cc198 100644 --- a/alipay/pages/cart/cart.json +++ b/alipay/pages/cart/cart.json @@ -1,3 +1,7 @@ { - "pullRefresh": true + "pullRefresh": true, + "usingComponents": { + "list-item": "mini-antui/es/list/list-item/index", + "swipe-action": "mini-antui/es/swipe-action/index" + } } \ No newline at end of file diff --git a/alipay/pages/goods-attribute/goods-attribute.axml b/alipay/pages/goods-attribute/goods-attribute.axml index 7fc414e6b..3fe902e10 100755 --- a/alipay/pages/goods-attribute/goods-attribute.axml +++ b/alipay/pages/goods-attribute/goods-attribute.axml @@ -11,7 +11,7 @@ - + diff --git a/alipay/pages/goods-category/goods-category.axml b/alipay/pages/goods-category/goods-category.axml index 626b33040..cbe23423b 100644 --- a/alipay/pages/goods-category/goods-category.axml +++ b/alipay/pages/goods-category/goods-category.axml @@ -10,7 +10,7 @@ - + {{v.name}} diff --git a/alipay/pages/goods-category/goods-category.js b/alipay/pages/goods-category/goods-category.js index 0a81655ba..455872a2e 100644 --- a/alipay/pages/goods-category/goods-category.js +++ b/alipay/pages/goods-category/goods-category.js @@ -7,16 +7,11 @@ Page({ data_list_loding_status: 1, data_bottom_line_status: false, data_list: [], - params: null, - }, - - onLoad(params) { - this.setData({params: params}); - this.init(); }, onShow() { my.setNavigationBar({title: app.data.common_pages_title.goods_category}); + this.init(); }, // 获取数据 @@ -30,7 +25,7 @@ Page({ my.httpRequest({ url: app.get_request_url("GoodsCategory", "Resources"), method: "POST", - data: this.data.params, + data: {}, dataType: "json", success: res => { my.stopPullDownRefresh(); diff --git a/alipay/pages/goods-detail/goods-detail.acss b/alipay/pages/goods-detail/goods-detail.acss index 908da9648..0c8150f47 100755 --- a/alipay/pages/goods-detail/goods-detail.acss +++ b/alipay/pages/goods-detail/goods-detail.acss @@ -109,15 +109,15 @@ height: 100rpx; } .goods-buy-nav .fl { - width: calc(25% - 1rpx); + width: calc(20% - 1rpx); } .goods-buy-nav .fr { - width: 50%; + width: 60%; } .goods-buy-nav .fr button { - border: 0; border-radius: 0; line-height: 100rpx; + width: 50%; } .goods-buy-nav .fr button, .goods-buy-nav .fl diff --git a/alipay/pages/goods-detail/goods-detail.axml b/alipay/pages/goods-detail/goods-detail.axml index 4182eaf58..7e700df46 100755 --- a/alipay/pages/goods-detail/goods-detail.axml +++ b/alipay/pages/goods-detail/goods-detail.axml @@ -71,7 +71,8 @@ {{goods_favor_text}} - + + diff --git a/alipay/pages/goods-detail/goods-detail.js b/alipay/pages/goods-detail/goods-detail.js index bc1f01bec..5c090a8f9 100755 --- a/alipay/pages/goods-detail/goods-detail.js +++ b/alipay/pages/goods-detail/goods-detail.js @@ -22,10 +22,11 @@ Page({ goods_favor_icon: '/images/goods-detail-favor-icon-0.png', temp_attribute_active: {}, temp_buy_number: 1, + buy_event_type: 'buy', }, onLoad(params) { - //params['goods_id']=1; + //params['goods_id']=16; this.setData({params: params}); this.init(); }, @@ -70,16 +71,16 @@ Page({ if (res.data.code == 0) { var data = res.data.data; self.setData({ - goods: data.goods, + goods: data, indicator_dots: (data.photo.length > 1), autoplay: (data.photo.length > 1), goods_photo: data.photo, goods_attribute_show: data.attribute.show || [], goods_attribute_choose: data.attribute.choose || [], goods_content_app: data.content_app, - temp_buy_number: (data.goods.buy_min_number) || 1, - goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏', - goods_favor_icon: '/images/goods-detail-favor-icon-'+data.goods.is_favor+'.png', + temp_buy_number: (data.buy_min_number) || 1, + goods_favor_text: (data.is_favor == 1) ? '已收藏' : '收藏', + goods_favor_icon: '/images/goods-detail-favor-icon-'+data.is_favor+'.png', data_bottom_line_status: true, data_list_loding_status: 3, }); @@ -134,9 +135,14 @@ Page({ }); }, + // 加入购物车 + cart_submit_event(e) { + this.setData({ popup_status: '', buy_event_type: 'cart' }); + }, + // 立即购买 buy_submit_event(e) { - this.setData({popup_status: ''}); + this.setData({ popup_status: '', buy_event_type: 'buy'}); }, // 收藏事件 @@ -151,19 +157,18 @@ Page({ }); return false; } else { - var self = this; my.showLoading({content: '处理中...'}); my.httpRequest({ url: app.get_request_url('Favor', 'Goods'), method: 'POST', - data: {goods_id: self.data.goods.id}, + data: {"id": this.data.goods.id}, dataType: 'json', success: (res) => { my.hideLoading(); if(res.data.code == 0) { - var status = (self.data.goods.is_favor == 1) ? 0 : 1; + var status = (this.data.goods.is_favor == 1) ? 0 : 1; this.setData({ 'goods.is_favor': status, goods_favor_text: (status == 1) ? '已收藏' : '收藏', @@ -193,6 +198,61 @@ Page({ } }, + // 加入购物车事件 + goods_cart_event(e) { + var user = app.GetUserInfo(this, 'goods_cart_event'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if ((user.mobile || null) == null) { + my.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + return false; + } else { + var attribute_all_cart = {}; + var temp_attribute_active = this.data.temp_attribute_active; + if (app.get_length(temp_attribute_active) > 0) + { + var goods_attribute_choose = this.data.goods_attribute_choose; + for (var i in temp_attribute_active) { + attribute_all_cart[goods_attribute_choose[i]['id']] = goods_attribute_choose[i]['find'][temp_attribute_active[i]]['id']; + } + } + my.showLoading({ content: '处理中...' }); + + my.httpRequest({ + url: app.get_request_url('Save', 'Cart'), + method: 'POST', + data: { "goods_id": this.data.goods.id, "stock": this.data.temp_buy_number, "attr": JSON.stringify(attribute_all_cart) }, + dataType: 'json', + success: (res) => { + my.hideLoading(); + if (res.data.code == 0) { + this.popup_close_event(); + my.showToast({ + type: 'success', + content: res.data.msg + }); + } else { + my.showToast({ + type: 'fail', + content: res.data.msg + }); + } + }, + fail: () => { + my.hideLoading(); + + my.showToast({ + type: 'fail', + content: '服务器请求出错' + }); + } + }); + } + } + }, + // 属性事件 goods_attribute_event(e) { var key = e.currentTarget.dataset.key || 0; @@ -256,7 +316,7 @@ Page({ this.setData({temp_buy_number: buy_number}); }, - // 购买确认 + // 确认 goods_buy_confirm_event(e) { var user = app.GetUserInfo(this, 'goods_buy_confirm_event'); if (user != false) { @@ -289,20 +349,37 @@ Page({ } } } + + // 操作类型 + switch (this.data.buy_event_type) { + case 'buy' : + // 进入订单确认页面 + var data = [{ + "goods_id": this.data.goods.id, + "buy_number": this.data.temp_buy_number, + "attribute": attribute_all.join(',') + }] + my.navigateTo({ + url: '/pages/buy/buy?data=' + JSON.stringify(data) + }); + break; - // 进入订单确认页面 - var data = [{ - "goods_id": this.data.goods.id, - "buy_number": this.data.temp_buy_number, - "attribute": attribute_all.join(',') - }] - my.navigateTo({ - url: '/pages/buy/buy?data='+JSON.stringify(data) - }); + case 'cart' : + this.goods_cart_event(); + break; + + default : + my.showToast({ + type: "fail", + content: "操作事件类型有误" + }); + } } } }, + + // 详情图片查看 goods_detail_images_view_event(e) { var value = e.currentTarget.dataset.value || null; diff --git a/alipay/pages/goods-search/goods-search.axml b/alipay/pages/goods-search/goods-search.axml index 13112bc5f..78b1a04b2 100755 --- a/alipay/pages/goods-search/goods-search.axml +++ b/alipay/pages/goods-search/goods-search.axml @@ -16,9 +16,9 @@ - - - + + + diff --git a/alipay/pages/user-address/user-address.axml b/alipay/pages/user-address/user-address.axml index 8ba1f3227..0c390c79e 100755 --- a/alipay/pages/user-address/user-address.axml +++ b/alipay/pages/user-address/user-address.axml @@ -13,8 +13,8 @@ - - + + 设为默认地址 diff --git a/service/Application/Admin/Controller/GoodsController.class.php b/service/Application/Admin/Controller/GoodsController.class.php index ec5bf22a1..c917aa3ec 100755 --- a/service/Application/Admin/Controller/GoodsController.class.php +++ b/service/Application/Admin/Controller/GoodsController.class.php @@ -102,7 +102,7 @@ class GoodsController extends CommonController $v['category_text'] = implode('，', $category_name); // 产地 - $v['place_origin_text'] = M('Region')->where(['id'=>$v['place_origin']])->getField('name'); + $v['place_origin_name'] = ResourcesService::RegionName($v['place_origin']); // 品牌 $v['brand_name'] = empty($v['brand_id']) ? null : M('Brand')->where(['id'=>$v['brand_id']])->getField('name'); diff --git a/service/Application/Admin/Lang/zh-cn/goods.php b/service/Application/Admin/Lang/zh-cn/goods.php index 37df73c4a..30ddd3962 100755 --- a/service/Application/Admin/Lang/zh-cn/goods.php +++ b/service/Application/Admin/Lang/zh-cn/goods.php @@ -21,7 +21,7 @@ return array( 'goods_category_id_text' => '商品分类', 'goods_category_id_format' => '请至少选择一个商品分类', - 'goods_place_origin_text' => '生产地', + 'goods_place_origin_name' => '生产地', 'goods_place_origin_format' => '请选择生产地', 'goods_inventory_text' => '库存数量', diff --git a/service/Application/Admin/View/Default/Goods/Index.html b/service/Application/Admin/View/Default/Goods/Index.html index 9cec81f8f..cdb6a2389 100755 --- a/service/Application/Admin/View/Default/Goods/Index.html +++ b/service/Application/Admin/View/Default/Goods/Index.html @@ -123,8 +123,8 @@

{{:L('goods_brand_id_text')}}
{{$v.brand_name}}
-
{{:L('goods_place_origin_text')}}
-
{{$v.place_origin_text}}
+
{{:L('goods_place_origin_name')}}
+
{{$v.place_origin_name}}
{{:L('goods_category_id_text')}}
{{$v.category_text}}
diff --git a/service/Application/Admin/View/Default/Goods/SaveInfo.html b/service/Application/Admin/View/Default/Goods/SaveInfo.html index d4b4f5238..cd27d0aae 100755 --- a/service/Application/Admin/View/Default/Goods/SaveInfo.html +++ b/service/Application/Admin/View/Default/Goods/SaveInfo.html @@ -98,7 +98,7 @@
- +