diff --git a/pages.json b/pages.json
index 7a623ee..07d3cbe 100644
--- a/pages.json
+++ b/pages.json
@@ -216,6 +216,16 @@
}
}
+ ,{
+ "path" : "pages/paper-detail/index",
+ "style" :
+ {
+ "navigationBarTitleText": "纸商城详情",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue
index 0dd5b4c..bf104e6 100644
--- a/pages/add-paper/index.vue
+++ b/pages/add-paper/index.vue
@@ -61,7 +61,7 @@
请选择纸种信息
{{ form.categoryName }}
-
+
@@ -117,7 +117,8 @@
{{ item.stockUnit === '1' ? '张' : '吨' }}
-
+
+
@@ -184,12 +185,15 @@
mode="grid"
file-extname="png,jpg"
:limit="6"
+ :image-styles="imageStyles"
@progress="progress"
@success="success"
@fail="fail"
@select="select"
@delete="deleteImage"
- />
+ >
+
+
@@ -299,6 +303,17 @@ export default {
brandName: null,
categoryId: null
},
+ imageStyles: {
+ width: 100,
+ height: 100,
+ background:'#000',
+ border: {
+ color: '#f1f1f1',
+ width: 1,
+ style: 'solid',
+ radius: '2rpx'
+ }
+ },
range: [{ value: 0, text: '是' }, { value: 1, text: '否' }],
placeholderStyle: 'text-align: right;',
searchList: [
@@ -553,6 +568,12 @@ export default {
.paper-price-image {
padding: 22rpx 32rpx;
}
+ .paper-upload-image{
+ width: 184rpx;
+ height: 184rpx;
+ background: rgba(220,222,224,0.50);
+ border-radius: 10rpx;
+ }
.paper-price-textArea {
background: #f7f8fa;
border-radius: 20rpx;
@@ -652,5 +673,8 @@ export default {
padding: 10rpx 32rpx;
background-color: #ffffff;
}
+ .paper-backColor{
+ background-color: rgba(220,222,224,1);
+ }
}
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 4f884e9..dcf7038 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -20,7 +20,7 @@
-
+
@@ -109,26 +109,26 @@ export default {
})
})
},
- downCallback() {
- this.orderPagination.pageNum = 1
- this.quertData()
- .then(({ list, total }) => {
- this.$refs.list.refreshSuccess({ list, total })
- })
- .catch(() => {
- this.$refs.list.refreshFail()
- })
- },
- upCallback() {
- this.orderPagination.pageNum++
- this.quertData()
- .then(({ list, total }) => {
- this.$refs.list.loadSuccess({ list, total })
- })
- .catch(() => {
- this.$refs.list.loadFail()
- })
- },
+ // downCallback() {
+ // this.orderPagination.pageNum = 1
+ // this.quertData()
+ // .then(({ list, total }) => {
+ // this.$refs.list.refreshSuccess({ list, total })
+ // })
+ // .catch(() => {
+ // this.$refs.list.refreshFail()
+ // })
+ // },
+ // upCallback() {
+ // this.orderPagination.pageNum++
+ // this.quertData()
+ // .then(({ list, total }) => {
+ // this.$refs.list.loadSuccess({ list, total })
+ // })
+ // .catch(() => {
+ // this.$refs.list.loadFail()
+ // })
+ // },
// 切换商城按钮
checkMall() {
go2('switching-mall')
@@ -150,6 +150,10 @@ export default {
// 店铺设置按钮
setting(){
go2('store-settings')
+ },
+ // 详情点击事件
+ detailInfo(){
+ go2('paper-detail')
}
}
}
diff --git a/pages/paper-detail/index.vue b/pages/paper-detail/index.vue
new file mode 100644
index 0000000..bc2e2f0
--- /dev/null
+++ b/pages/paper-detail/index.vue
@@ -0,0 +1,37 @@
+
+
+
+
+ 纸品详情
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/store-settings/index.vue b/pages/store-settings/index.vue
index b6ea983..ba305a1 100644
--- a/pages/store-settings/index.vue
+++ b/pages/store-settings/index.vue
@@ -36,14 +36,18 @@
@fail="fail"
@select="select"
@delete="deleteImage"
- />
+ >
+
+
建议尺寸：200*200像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面
背景图片
-
+
+
+
建议尺寸：750*370像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面
@@ -62,24 +66,14 @@ export default {
storeName: '',
imageValue: [],
imageStyles: {
- width: 100,
+ width: 120,
height: 100,
- border: {
- color: '#f1f1f1',
- width: 1,
- style: 'dashed',
- radius: '4rpx'
- }
+ border: false
},
imageStylest: {
width: 183,
height: 94,
- border: {
- color: '#f1f1f1',
- width: 1,
- style: 'dashed',
- radius: '4rpx'
- }
+ border: false
}
}
},
@@ -158,9 +152,11 @@ export default {
}
.stotr-image-widtht{
width: 100%;
+ background-color: rgba(220,222,224,1);
}
.stotr-image-width{
- width: 50%;
+ width: 48%;
+ background-color: rgba(220,222,224,1);
}
.upload-btn{
position: absolute;
@@ -168,5 +164,11 @@ export default {
bottom: 32rpx;
left: 32rpx;
}
+ .paper-upload-image{
+ width: 120rpx;
+ height: 120rpx;
+ background: rgba(220,222,224,1);
+ border-radius: 10rpx;
+ }
}
diff --git a/static/imgs/trade/uploadImage.png b/static/imgs/trade/uploadImage.png
new file mode 100644
index 0000000..17bbc77
Binary files /dev/null and b/static/imgs/trade/uploadImage.png differ