diff --git a/pages.json b/pages.json
index fd9a0b1..3facdbf 100644
--- a/pages.json
+++ b/pages.json
@@ -308,12 +308,11 @@
}
},
{
- "path" : "pages/cashier/cashier",
- "style" :
- {
- "navigationBarTitleText" : "收银",
- "enablePullDownRefresh" : true
- }
+ "path": "pages/cashier/cashier",
+ "style": {
+ "navigationBarTitleText": "收银",
+ "enablePullDownRefresh": true
+ }
}
],
"subPackages": [{
@@ -1509,6 +1508,13 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "addGood/addGoodOld",
+ "style": {
+ "navigationBarTitleText": "发布商品",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "addGood/addGood_one",
"style": {
@@ -1536,6 +1542,13 @@
"navigationBarTitleText": "更新库存",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "addGoodDetail/addGoodDetail",
+ "style": {
+ "navigationBarTitleText": "发布商品",
+ "enablePullDownRefresh": false
+ }
}
]
},
diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue
index 33e97b4..6cb989b 100644
--- a/pages/product/addGood/addGood.vue
+++ b/pages/product/addGood/addGood.vue
@@ -1,762 +1,157 @@
-
-
-
-
- 商品条码
-
+
+
+
+
+
-
-
-
- (品牌,名称,规格,口味)
-
- {{ setFormData.store_name.length }}
- 0/60
-
-
+
+
+
+
+
+
+
+
-
- 建议：图片尺寸为750*750px, 上传2张以上
-
-
-
-
-
-
-
-
-
-
-
- 添加图片
-
-
+ 元
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/product/addGood/addGoodOld.vue b/pages/product/addGood/addGoodOld.vue
new file mode 100644
index 0000000..33e97b4
--- /dev/null
+++ b/pages/product/addGood/addGoodOld.vue
@@ -0,0 +1,762 @@
+
+
+
+
+
+ 商品条码
+
+
+
+
+
+ (品牌,名称,规格,口味)
+
+ {{ setFormData.store_name.length }}
+ 0/60
+
+
+
+
+ 建议：图片尺寸为750*750px, 上传2张以上
+
+
+
+
+
+
+
+
+
+
+
+ 添加图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/product/addGood/components/commodity.vue b/pages/product/addGood/components/commodity.vue
index a17c77e..fb13e57 100644
--- a/pages/product/addGood/components/commodity.vue
+++ b/pages/product/addGood/components/commodity.vue
@@ -1,539 +1,550 @@
-
-
-
-
- 商品详情
-
-
-
-
- 商品视频
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
- 点击可预览视频
-
-
-
-
-
-
-
- 点击可预览视频
-
-
-
-
-
-
-
- 添加视频
-
-
-
-
-
- 是否推荐
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击可预览视频
+
+
+
+
+
+
+
+ 点击可预览视频
+
+
+
+
+
+
+
+ 添加视频
+
+
+
+
+
+ 是否推荐
+
+
+
+
+
-
-
-
-
-
- 商品排序
-
-
-
-
-
-
-
- 更多
- 收起
-
-
-
-
-
-
-
+
+ 商品排序
+
+
+
+
+
+
+
+ 更多
+ 收起
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/product/addGood/components/uploadImgVideo.vue b/pages/product/addGood/components/uploadImgVideo.vue
new file mode 100644
index 0000000..12f2f72
--- /dev/null
+++ b/pages/product/addGood/components/uploadImgVideo.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/product/addGoodDetail/addGoodDetail.vue b/pages/product/addGoodDetail/addGoodDetail.vue
new file mode 100644
index 0000000..45e8dda
--- /dev/null
+++ b/pages/product/addGoodDetail/addGoodDetail.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/images/addGodd/addGoodBg.png b/static/images/addGodd/addGoodBg.png
new file mode 100644
index 0000000..a299877
Binary files /dev/null and b/static/images/addGodd/addGoodBg.png differ
diff --git a/uni.scss b/uni.scss
index 45776b4..f66c6a0 100644
--- a/uni.scss
+++ b/uni.scss
@@ -14,6 +14,7 @@
@import '@/uni_modules/uview-ui/theme.scss';
/* 颜色变量 */
$uni-theme-color: #f45846;
+$uni-newTheme-color: #38BE41;
$uni-theme-bg-color: linear-gradient(180deg, #f98649 0%, #f34e45 100%);
/* 行为相关颜色 */
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index 9b32348..0b7fa55 100644
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -6,8 +6,8 @@
{{current}}
{{typePlaceholder}}
-
-
+
+
@@ -20,9 +20,10 @@
{{emptyTips}}
-
- {{formatItemName(item)}}
+
+ {{formatItemName(item)}}
@@ -125,7 +126,7 @@
common + placeholder :
common
},
- valueCom(){
+ valueCom() {
// #ifdef VUE3
return this.modelValue;
// #endif
@@ -156,7 +157,7 @@
}
},
methods: {
- debounce(fn, time = 100){
+ debounce(fn, time = 100) {
let timer = null
return function(...args) {
if (timer) clearTimeout(timer)
@@ -166,11 +167,11 @@
}
},
// 执行数据库查询
- query(){
+ query() {
this.mixinDatacomEasyGet();
},
// 监听查询条件变更事件
- onMixinDatacomPropsChange(){
+ onMixinDatacomPropsChange() {
if (this.collection) {
this.debounceGet();
}
@@ -193,9 +194,9 @@
}
defValue = defItem
}
- if (defValue || defValue === 0) {
- this.emit(defValue)
- }
+ if (defValue || defValue === 0) {
+ this.emit(defValue)
+ }
}
const def = this.mixinDatacomResData.find(item => item.value === defValue)
this.current = def ? this.formatItemName(def) : ''
@@ -258,7 +259,7 @@
let str = "";
str = this.format;
for (let key in item) {
- str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+ str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
}
return str;
} else {
@@ -272,26 +273,26 @@
}
},
// 获取当前加载的数据
- getLoadData(){
+ getLoadData() {
return this.mixinDatacomResData;
},
// 获取当前缓存key
- getCurrentCacheKey(){
+ getCurrentCacheKey() {
return this.collection;
},
// 获取缓存
- getCache(name=this.getCurrentCacheKey()){
+ getCache(name = this.getCurrentCacheKey()) {
let cacheData = uni.getStorageSync(this.cacheKey) || {};
return cacheData[name];
},
// 设置缓存
- setCache(value, name=this.getCurrentCacheKey()){
+ setCache(value, name = this.getCurrentCacheKey()) {
let cacheData = uni.getStorageSync(this.cacheKey) || {};
cacheData[name] = value;
uni.setStorageSync(this.cacheKey, cacheData);
},
// 删除缓存
- removeCache(name=this.getCurrentCacheKey()){
+ removeCache(name = this.getCurrentCacheKey()) {
let cacheData = uni.getStorageSync(this.cacheKey) || {};
delete cacheData[name];
uni.setStorageSync(this.cacheKey, cacheData);
@@ -431,6 +432,7 @@
max-height: 600px;
}
}
+
/* #endif */
.uni-select__selector-empty,
@@ -514,4 +516,4 @@
left: 0;
z-index: 2;
}
-
+
\ No newline at end of file