diff --git a/src/pages.json b/src/pages.json
index 99ab599..005c6e3 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -904,6 +904,12 @@
"style" : {
"navigationBarTitleText": "商城"
}
+ },
+ {
+ "path": "pages/goods_info",
+ "style" : {
+ "navigationBarTitleText": "商品详情"
+ }
}
]
}
diff --git a/src/subpackage/mall/components/bottom_modal.vue b/src/subpackage/mall/components/bottom_modal.vue
new file mode 100644
index 0000000..09a83f5
--- /dev/null
+++ b/src/subpackage/mall/components/bottom_modal.vue
@@ -0,0 +1,50 @@
+
+
+
+ 配送说明
+
+ 关闭
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/mall/components/line_button.vue b/src/subpackage/mall/components/line_button.vue
index 4ed1f46..84b31fd 100644
--- a/src/subpackage/mall/components/line_button.vue
+++ b/src/subpackage/mall/components/line_button.vue
@@ -1,5 +1,5 @@
-
+
confirm
diff --git a/src/subpackage/mall/components/number_operate.vue b/src/subpackage/mall/components/number_operate.vue
index cc2035c..503d6b9 100644
--- a/src/subpackage/mall/components/number_operate.vue
+++ b/src/subpackage/mall/components/number_operate.vue
@@ -2,23 +2,35 @@
-
+
diff --git a/src/subpackage/mall/js/api.js b/src/subpackage/mall/js/api.js
index 457697a..5de9aca 100644
--- a/src/subpackage/mall/js/api.js
+++ b/src/subpackage/mall/js/api.js
@@ -1,8 +1,10 @@
-import { ORIGIN } from '@/js/api';
-
+// import { ORIGIN } from '@/js/api';
+const ORIGIN = `https://test.ouxuanzhineng.cn`; // 测试
export const MALL_API = {
homeShow:`${ORIGIN}/shop2/homeShow`, // 首页设置信息
goodsCartAdd:`${ORIGIN}/shop2/goodsCartAdd`, //购物车 - 添加商品
+ goodsSpecSel:`${ORIGIN}/shop2/goodsSpecSel`, //商品规格选择【返回库存&价格】
+ goodsInfo:`${ORIGIN}/shop2/goodsInfo`, //商品详情
}
export default { ORIGIN, MALL_API };
\ No newline at end of file
diff --git a/src/subpackage/mall/pages/goods_info.vue b/src/subpackage/mall/pages/goods_info.vue
new file mode 100644
index 0000000..6a0c4db
--- /dev/null
+++ b/src/subpackage/mall/pages/goods_info.vue
@@ -0,0 +1,484 @@
+
+
+
+
+
+
+ 配送
+
+ {{ getDeliveryTxt }}
+
+
+
+
+ 说明
+
+
+
+ {{ e || '' }}
+
+
+
+
+
+ 已选
+
+
+
+ 配送/自提
+
+
+
+
+
+
+
+
+
+ 商品详情
+
+
+
+
+
+
+
+
+
+ 首页
+
+
+
+ 购物车
+ 99
+
+
+
+ 加入购物车
+ 立即购买
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/mall/pages/index.vue b/src/subpackage/mall/pages/index.vue
index 5d01319..6fb1ddb 100644
--- a/src/subpackage/mall/pages/index.vue
+++ b/src/subpackage/mall/pages/index.vue
@@ -76,7 +76,7 @@ import indexSearchBar from "../components/index_search_bar.vue";
import indexClassifyBar from "../components/index_classify_bar.vue";
import goodsItem from "../components/goods_item.vue";
import spacificationModal from "../components/specification_modal.vue";
-import { routeTo, debounce, showLoad, hideLoad, showModal, showNone, tsRoute, jsonStr } from "@/utils/util.js";
+import { routeTo, showLoad, hideLoad, showModal, tsRoute, jsonStr } from "@/utils/util.js";
import { MALL_API } from "../js/api";
import server from "../js/server";
export default {
@@ -150,7 +150,14 @@ export default {
// 如果商品是多个规格属性的,则出现弹窗给用户选择规格加入购物车,如果是单规格的则直接加入购物车
// 根据product_spec_multi字段做判断 等于1则是多规格
if(e.product_spec_multi == 1){
+ // e.product_spec.push({
+ // id: 3,
+ // name: 'test',
+ // value: ['test1', 'test2', 'test3']
+ // })
this.$refs.spacificationModal.alert({
+ id: e?.id ?? '',
+ brand_id: brand_id,
poster: e?.product_imgs?.[0] ?? '',
name: e?.product_name ?? '',
price: e?.product_price ?? '',
diff --git a/src/subpackage/mall/static/images/arrow_873.png b/src/subpackage/mall/static/images/arrow_873.png
new file mode 100644
index 0000000..71d442a
Binary files /dev/null and b/src/subpackage/mall/static/images/arrow_873.png differ
diff --git a/src/subpackage/mall/static/images/arrow_9ad.png b/src/subpackage/mall/static/images/arrow_9ad.png
new file mode 100644
index 0000000..b76426a
Binary files /dev/null and b/src/subpackage/mall/static/images/arrow_9ad.png differ
diff --git a/src/subpackage/mall/static/images/home.png b/src/subpackage/mall/static/images/home.png
new file mode 100644
index 0000000..b85268e
Binary files /dev/null and b/src/subpackage/mall/static/images/home.png differ
diff --git a/src/subpackage/mall/static/images/selected.png b/src/subpackage/mall/static/images/selected.png
new file mode 100644
index 0000000..9f42576
Binary files /dev/null and b/src/subpackage/mall/static/images/selected.png differ
diff --git a/src/subpackage/mall/static/images/share.png b/src/subpackage/mall/static/images/share.png
new file mode 100644
index 0000000..7701793
Binary files /dev/null and b/src/subpackage/mall/static/images/share.png differ
diff --git a/src/subpackage/mall/static/images/shopping_cart.png b/src/subpackage/mall/static/images/shopping_cart.png
new file mode 100644
index 0000000..f7adbcc
Binary files /dev/null and b/src/subpackage/mall/static/images/shopping_cart.png differ
diff --git a/src/subpackage/mall/static/images/star.png b/src/subpackage/mall/static/images/star.png
new file mode 100644
index 0000000..e55430c
Binary files /dev/null and b/src/subpackage/mall/static/images/star.png differ
diff --git a/src/uni.scss b/src/uni.scss
index 7745bde..082358c 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -105,4 +105,16 @@ $mColor: #009874;
padding-bottom: $height;
padding-bottom: calc( $height + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
padding-bottom: calc( $height + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+}
+
+@mixin clearBtn{
+ margin: 0;
+ padding: 0;
+ line-height: 0;
+ background-color: transparent;
+ border-radius: 0;
+ &::after{
+ position: unset !important;
+ border: unset;
+ }
}
\ No newline at end of file