Commit 8cb99bc6 authored by 郭晓清's avatar 郭晓清
parents 02cb75aa 4ab5e0b9
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,7 @@ export default {
currentItem: null, // 选择的某一项 currentItem: null, // 选择的某一项
setting: null, //自定义设置 setting: null, //自定义设置
waterSetting: null, // 水印设置 waterSetting: null, // 水印设置
allImages: [],
tempPath: { tempPath: {
origin: '', // 缓存拍照图片 origin: '', // 缓存拍照图片
mixWater: '' // 缓存水印拍照图片 mixWater: '' // 缓存水印拍照图片
......
export default [{ export default [{
"groupName": "女装", "groupName": "接入点信息",
"item": [{ "item": [{
"required": true, "required": true,
"fieldsTitle": "A字裙多个", "fieldsTitle": "多框输入",
"fieldsName": "name", "fieldsName": "name",
"fieldsType": "multiInput", "fieldsType": "multiinput",
"fieldsValue": "", "fieldsValue": "",
"inputOptions":[{ "inputOptions":[{
"fieldsTitle": "A字裙", "fieldsTitle": "开孔大小",
"fieldsName": "name1", "fieldsName": "name1",
"fieldsType": "text", "fieldsType": "text",
"value": '2233',
"placeholder": '开孔大小'
},{ },{
"fieldsTitle": "A字裙", "fieldsTitle": "开孔数量",
"fieldsName": "name2", "fieldsName": "num",
"fieldsType": "text", "fieldsType": "text",
"placeholder": '开孔数量'
},{ },{
"fieldsTitle": "A字裙", "fieldsTitle": "请输入",
"fieldsName": "name3", "fieldsName": "name3",
"fieldsType": "text", "fieldsType": "text",
},{ "placeholder": '请输入'
"fieldsTitle": "A字裙", }],
"fieldsName": "name3", "key": "A多框输入",
"fieldsType": "text",
},{
"fieldsTitle": "A字裙",
"fieldsName": "name4",
"fieldsType": "text",
},{
"fieldsTitle": "A字裙",
"fieldsName": "name5",
"fieldsType": "text",
},],
"key": "A字裙",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg", "icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
"cat": 10 "cat": 10
},{ },{
"required": true, "required": true,
"fieldsTitle": "A字裙", "fieldsTitle": "输入框",
"fieldsName": "name", "fieldsName": "name",
"fieldsType": "input", "fieldsType": "text",
"fieldsValue": "", "fieldsValue": "",
"span":8, "span":8,
"key": "A字裙", "key": "A字裙",
...@@ -58,7 +50,7 @@ export default [{ ...@@ -58,7 +50,7 @@ export default [{
"fieldsTitle": "多选", "fieldsTitle": "多选",
"fieldsName": "checkbox", "fieldsName": "checkbox",
"fieldsType": "checkbox", "fieldsType": "checkbox",
"settings": ['车主电', '物业电', '国电'], "settings": ['居民用电电价(不分时)', '非居民用电电价(不分时)', '居民用电电价峰谷时段(分时)', '非居民用电电价峰谷时段(分时)'],
"key": "半身裙", "key": "半身裙",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/3.jpg", "icon": "https://cdn.uviewui.com/uview/common/classify/1/3.jpg",
"cat": 10 "cat": 10
...@@ -73,7 +65,15 @@ export default [{ ...@@ -73,7 +65,15 @@ export default [{
"cat": 10 "cat": 10
}, },
{ {
"fieldsTitle": "文件选择", "fieldsTitle": "电缆",
"fieldsName": "file",
"fieldsType": "file",
"key": "短裙",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg",
"cat": 10
},
{
"fieldsTitle": "管材",
"fieldsName": "file", "fieldsName": "file",
"fieldsType": "file", "fieldsType": "file",
"key": "短裙", "key": "短裙",
...@@ -81,7 +81,7 @@ export default [{ ...@@ -81,7 +81,7 @@ export default [{
"cat": 10 "cat": 10
}, },
{ {
"fieldsTitle": "获取经纬度", "fieldsTitle": "坐标",
"fieldsName": "location", "fieldsName": "location",
"fieldsType": "location", "fieldsType": "location",
"required": true, "required": true,
...@@ -117,8 +117,9 @@ export default [{ ...@@ -117,8 +117,9 @@ export default [{
"cat": 10 "cat": 10
}, },
{ {
"fieldsTitle": "情侣装", "fieldsTitle": "备注",
"key": "情侣装", "key": "备注",
"fieldsType": "textarea",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/10.jpg", "icon": "https://cdn.uviewui.com/uview/common/classify/1/10.jpg",
"cat": 10 "cat": 10
}, },
...@@ -149,986 +150,6 @@ export default [{ ...@@ -149,986 +150,6 @@ export default [{
] ]
}, },
{ {
"groupName": "美食", "groupName": "社区信息",
"item": [{
"fieldsTitle": "火锅",
"key": "火锅",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
"cat": 6
},
{
"fieldsTitle": "糕点饼干",
"key": "糕点饼干",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/2.jpg",
"cat": 6
},
{
"fieldsTitle": "坚果果干",
"key": "坚果果干",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/3.jpg",
"cat": 6
},
{
"fieldsTitle": "酒类",
"key": "酒类",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/4.jpg",
"cat": 6
},
{
"fieldsTitle": "辣条",
"key": "辣条",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/5.jpg",
"cat": 6
},
{
"fieldsTitle": "大礼包",
"key": "大礼包",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/6.jpg",
"cat": 6
},
{
"fieldsTitle": "精品茗茶",
"key": "茶",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
"cat": 6
},
{
"fieldsTitle": "休闲食品",
"key": "休闲食品",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
"cat": 6
},
{
"fieldsTitle": "糖果巧克力",
"key": "糖果巧克力",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/9.jpg",
"cat": 6
},
{
"fieldsTitle": "方便速食",
"key": "方便速食",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/10.jpg",
"cat": 6
},
{
"fieldsTitle": "营养代餐",
"key": "营养代餐",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/11.jpg",
"cat": 6
},
{
"fieldsTitle": "粮油副食",
"key": "粮油",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/12.jpg",
"cat": 6
},
{
"fieldsTitle": "生鲜水果",
"key": "水果",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/13.jpg",
"cat": 6
},
{
"fieldsTitle": "饮品",
"key": "饮品",
"icon": "https://cdn.uviewui.com/uview/common/classify/2/14.jpg",
"cat": 6
}
]
},
{
"groupName": "美妆",
"item": [{
"fieldsTitle": "化妆刷",
"key": "化妆刷",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
"cat": 3
},
{
"fieldsTitle": "粉底",
"key": "粉底",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/2.jpg",
"cat": 3
},
{
"fieldsTitle": "洗发护发",
"key": "洗发护发",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/3.jpg",
"cat": 3
},
{
"fieldsTitle": "美容工具",
"key": "美容工具",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/4.jpg",
"cat": 3
},
{
"fieldsTitle": "眼部护理",
"key": "眼部护理",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/5.jpg",
"cat": 3
},
{
"fieldsTitle": "眉妆",
"key": "眉妆",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/6.jpg",
"cat": 3
},
{
"fieldsTitle": "卸妆品",
"key": "卸妆品",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/7.jpg",
"cat": 3
},
{
"fieldsTitle": "基础护肤",
"key": "基础护肤",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/8.jpg",
"cat": 3
},
{
"fieldsTitle": "眼妆",
"key": "眼妆",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/9.jpg",
"cat": 3
},
{
"fieldsTitle": "唇妆",
"key": "唇妆",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/10.jpg",
"cat": 3
},
{
"fieldsTitle": "面膜",
"key": "面膜",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/11.jpg",
"cat": 3
},
{
"fieldsTitle": "沐浴用品",
"key": "沐浴用品",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/12.jpg",
"cat": 3
},
{
"fieldsTitle": "护肤套装",
"key": "护肤套装",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/13.jpg",
"cat": 3
},
{
"fieldsTitle": "防晒品",
"key": "防晒品",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
"cat": 3
},
{
"fieldsTitle": "美甲",
"key": "美甲",
"icon": "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
"cat": 3
}
]
},
{
"groupName": "居家日用",
"item": [{
"fieldsTitle": "垃圾袋",
"key": "垃圾袋",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/1.jpg",
"cat": 4
},
{
"fieldsTitle": "纸巾",
"key": "纸巾",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/2.jpg",
"cat": 4
},
{
"fieldsTitle": "驱蚊用品",
"key": "驱蚊用品",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/3.jpg",
"cat": 4
},
{
"fieldsTitle": "收纳神器",
"key": "收纳神器",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/4.jpg",
"cat": 4
},
{
"fieldsTitle": "厨房用品",
"key": "厨房用品",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/5.jpg",
"cat": 4
},
{
"fieldsTitle": "厨房烹饪",
"key": "烹饪",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/6.jpg",
"cat": 4
},
{
"fieldsTitle": "衣物晾晒",
"key": "衣物晾晒",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/7.jpg",
"cat": 4
},
{
"fieldsTitle": "衣物护理",
"key": "衣物护理",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/8.jpg",
"cat": 4
},
{
"fieldsTitle": "宠物用品",
"key": "宠物用品",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/9.jpg",
"cat": 4
},
{
"fieldsTitle": "医药保健",
"key": "医药",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/10.jpg",
"cat": 4
},
{
"fieldsTitle": "日用百货",
"key": "百货",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/11.jpg",
"cat": 4
},
{
"fieldsTitle": "清洁用品",
"key": "清洁",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/12.jpg",
"cat": 4
},
{
"fieldsTitle": "绿植园艺",
"key": "绿植",
"icon": "https://cdn.uviewui.com/uview/common/classify/4/13.jpg",
"cat": 4
}
]
},
{
"groupName": "男装",
"item": [{
"fieldsTitle": "爸爸装",
"key": "爸爸装",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/1.jpg",
"cat": 12
},
{
"fieldsTitle": "牛仔裤",
"key": "牛仔裤",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/2.jpg",
"cat": 12
},
{
"fieldsTitle": "衬衫",
"key": "衬衫",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/3.jpg",
"cat": 12
},
{
"fieldsTitle": "休闲裤",
"key": "休闲裤",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/4.jpg",
"cat": 12
},
{
"fieldsTitle": "外套",
"key": "外套",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/5.jpg",
"cat": 12
},
{
"fieldsTitle": "T恤",
"key": "T恤",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/6.jpg",
"cat": 12
},
{
"fieldsTitle": "套装",
"key": "套装",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/7.jpg",
"cat": 12
},
{
"fieldsTitle": "运动裤",
"key": "运动裤",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/8.jpg",
"cat": 12
},
{
"fieldsTitle": "马甲/背心",
"key": "马甲背心",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/9.jpg",
"cat": 12
},
{
"fieldsTitle": "POLO衫",
"key": "POLO衫",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/10.jpg",
"cat": 12
},
{
"fieldsTitle": "商务装",
"key": "商务装",
"icon": "https://cdn.uviewui.com/uview/common/classify/5/11.jpg",
"cat": 12
}
]
},
{
"groupName": "鞋品",
"item": [{
"fieldsTitle": "单鞋",
"key": "单鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/1.jpg",
"cat": 5
},
{
"fieldsTitle": "皮鞋",
"key": "皮鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/2.jpg",
"cat": 5
},
{
"fieldsTitle": "帆布鞋",
"key": "帆布鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/3.jpg",
"cat": 5
},
{
"fieldsTitle": "北京老布鞋",
"key": "北京老布鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/4.jpg",
"cat": 5
},
{
"fieldsTitle": "运动鞋",
"key": "运动鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/5.jpg",
"cat": 5
},
{
"fieldsTitle": "拖鞋",
"key": "拖鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/6.jpg",
"cat": 5
},
{
"fieldsTitle": "凉鞋",
"key": "凉鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/7.jpg",
"cat": 5
},
{
"fieldsTitle": "休闲鞋",
"key": "休闲鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/8.jpg",
"cat": 5
},
{
"fieldsTitle": "高跟鞋",
"key": "高跟鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/9.jpg",
"cat": 5
},
{
"fieldsTitle": "老人鞋",
"key": "老人鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/10.jpg",
"cat": 5
},
{
"fieldsTitle": "懒人鞋",
"key": "懒人鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/6/11.jpg",
"cat": 5
}
]
},
{
"groupName": "数码家电",
"item": [{
"fieldsTitle": "数据线",
"key": "数据线",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/1.jpg",
"cat": 8
},
{
"fieldsTitle": "耳机",
"key": "耳机",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/2.jpg",
"cat": 8
},
{
"fieldsTitle": "生活家电",
"key": "家电",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/3.jpg",
"cat": 8
},
{
"fieldsTitle": "电风扇",
"key": "电风扇",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/4.jpg",
"cat": 8
},
{
"fieldsTitle": "电吹风",
"key": "电吹风",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/5.jpg",
"cat": 8
},
{
"fieldsTitle": "手机壳",
"key": "手机壳",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/6.jpg",
"cat": 8
},
{
"fieldsTitle": "榨汁机",
"key": "榨汁机",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/7.jpg",
"cat": 8
},
{
"fieldsTitle": "小家电",
"key": "小家电",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/8.jpg",
"cat": 8
},
{
"fieldsTitle": "数码电子",
"key": "数码",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/9.jpg",
"cat": 8
},
{
"fieldsTitle": "电饭锅",
"key": "电饭锅",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/10.jpg",
"cat": 8
},
{
"fieldsTitle": "手机支架",
"key": "手机支架",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/11.jpg",
"cat": 8
},
{
"fieldsTitle": "剃须刀",
"key": "剃须刀",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/12.jpg",
"cat": 8
},
{
"fieldsTitle": "充电宝",
"key": "充电宝",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/13.jpg",
"cat": 8
},
{
"fieldsTitle": "手机配件",
"key": "手机配件",
"icon": "https://cdn.uviewui.com/uview/common/classify/7/14.jpg",
"cat": 8
}
]
},
{
"groupName": "母婴",
"item": [{
"fieldsTitle": "婴童服饰",
"key": "衣服",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/1.jpg",
"cat": 2
},
{
"fieldsTitle": "玩具乐器",
"key": "玩具乐器",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/2.jpg",
"cat": 2
},
{
"fieldsTitle": "尿不湿",
"key": "尿不湿",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/3.jpg",
"cat": 2
},
{
"fieldsTitle": "安抚牙胶",
"key": "安抚牙胶",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/4.jpg",
"cat": 2
},
{
"fieldsTitle": "奶瓶奶嘴",
"key": "奶瓶奶嘴",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/5.jpg",
"cat": 2
},
{
"fieldsTitle": "孕妈用品",
"key": "孕妈用品",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/6.jpg",
"cat": 2
},
{
"fieldsTitle": "宝宝用品",
"key": "宝宝用品",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/7.jpg",
"cat": 2
},
{
"fieldsTitle": "婴童湿巾",
"key": "湿巾",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/8.jpg",
"cat": 2
},
{
"fieldsTitle": "喂养洗护",
"key": "洗护",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/9.jpg",
"cat": 2
},
{
"fieldsTitle": "婴童鞋靴",
"key": "童鞋",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/10.jpg",
"cat": 2
},
{
"fieldsTitle": "口水巾",
"key": "口水巾",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/11.jpg",
"cat": 2
},
{
"fieldsTitle": "营养辅食",
"key": "营养",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/12.jpg",
"cat": 2
},
{
"fieldsTitle": "婴幼书籍",
"key": "书籍",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/13.jpg",
"cat": 2
},
{
"fieldsTitle": "婴儿车",
"key": "婴儿车",
"icon": "https://cdn.uviewui.com/uview/common/classify/8/14.jpg",
"cat": 2
}
]
},
{
"groupName": "箱包",
"item": [{
"fieldsTitle": "单肩包",
"key": "单肩包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/1.jpg",
"cat": 0
},
{
"fieldsTitle": "斜挎包",
"key": "斜挎包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/2.jpg",
"cat": 0
},
{
"fieldsTitle": "女包",
"key": "女包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/3.jpg",
"cat": 0
},
{
"fieldsTitle": "男包",
"key": "男包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/4.jpg",
"cat": 0
},
{
"fieldsTitle": "双肩包",
"key": "双肩包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/5.jpg",
"cat": 0
},
{
"fieldsTitle": "小方包",
"key": "小方包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/6.jpg",
"cat": 0
},
{
"fieldsTitle": "钱包",
"key": "钱包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/7.jpg",
"cat": 0
},
{
"fieldsTitle": "旅行箱包",
"key": "旅行箱包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/8.jpg",
"cat": 0
},
{
"fieldsTitle": "零钱包",
"key": "零钱包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/9.jpg",
"cat": 0
},
{
"fieldsTitle": "手提包",
"key": "手提包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/10.jpg",
"cat": 0
},
{
"fieldsTitle": "胸包",
"key": "胸包",
"icon": "https://cdn.uviewui.com/uview/common/classify/9/11.jpg",
"cat": 0
}
]
},
{
"groupName": "内衣",
"item": [{
"fieldsTitle": "袜子",
"key": "袜子",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/1.jpg",
"cat": 11
},
{
"fieldsTitle": "吊带背心",
"key": "吊带背心",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/2.jpg",
"cat": 11
},
{
"fieldsTitle": "抹胸",
"key": "抹胸",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/3.jpg",
"cat": 11
},
{
"fieldsTitle": "内裤",
"key": "内裤",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/4.jpg",
"cat": 11
},
{
"fieldsTitle": "文胸",
"key": "文胸",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/5.jpg",
"cat": 11
},
{
"fieldsTitle": "文胸套装",
"key": "文胸套装",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/6.jpg",
"cat": 11
},
{
"fieldsTitle": "打底塑身",
"key": "打底塑身",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/7.jpg",
"cat": 11
},
{
"fieldsTitle": "家居服",
"key": "家居服",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/8.jpg",
"cat": 11
},
{
"fieldsTitle": "船袜",
"key": "船袜",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/9.jpg",
"cat": 11
},
{
"fieldsTitle": "情侣睡衣",
"key": "情侣睡衣",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/10.jpg",
"cat": 11
},
{
"fieldsTitle": "丝袜",
"key": "丝袜",
"icon": "https://cdn.uviewui.com/uview/common/classify/10/11.jpg",
"cat": 11
}
]
},
{
"groupName": "文娱车品",
"item": [{
"fieldsTitle": "车市车品",
"key": "车市车品",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/1.jpg",
"cat": 7
},
{
"fieldsTitle": "办公文具",
"key": "办公文具",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/2.jpg",
"cat": 7
},
{
"fieldsTitle": "考试必备",
"key": "考试必备",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/3.jpg",
"cat": 7
},
{
"fieldsTitle": "笔记本",
"key": "笔记本",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/4.jpg",
"cat": 7
},
{
"fieldsTitle": "艺术礼品",
"key": "礼品",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/5.jpg",
"cat": 7
},
{
"fieldsTitle": "书写工具",
"key": "书写工具",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/6.jpg",
"cat": 7
},
{
"fieldsTitle": "车载电器",
"key": "车载电器",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/7.jpg",
"cat": 7
},
{
"fieldsTitle": "图书音像",
"key": "图书音像",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/8.jpg",
"cat": 7
},
{
"fieldsTitle": "画具画材",
"key": "画具画材",
"icon": "https://cdn.uviewui.com/uview/common/classify/11/9.jpg",
"cat": 7
}
]
},
{
"groupName": "配饰",
"item": [{
"fieldsTitle": "太阳镜",
"key": "太阳镜",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/1.jpg",
"cat": 0
},
{
"fieldsTitle": "皮带",
"key": "皮带",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/2.jpg",
"cat": 0
},
{
"fieldsTitle": "棒球帽",
"key": "棒球帽",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/3.jpg",
"cat": 0
},
{
"fieldsTitle": "手表",
"key": "手表",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/4.jpg",
"cat": 0
},
{
"fieldsTitle": "发饰",
"key": "发饰",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/5.jpg",
"cat": 0
},
{
"fieldsTitle": "项链",
"key": "项链",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/6.jpg",
"cat": 0
},
{
"fieldsTitle": "手饰",
"key": "手饰",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/7.jpg",
"cat": 0
},
{
"fieldsTitle": "耳环",
"key": "耳环",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/8.jpg",
"cat": 0
},
{
"fieldsTitle": "帽子丝巾",
"key": "帽子丝巾",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/9.jpg",
"cat": 0
},
{
"fieldsTitle": "眼镜墨镜",
"key": "眼镜墨镜",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/10.jpg",
"cat": 0
},
{
"fieldsTitle": "发带发箍",
"key": "发带发箍",
"icon": "https://cdn.uviewui.com/uview/common/classify/12/11.jpg",
"cat": 0
}
]
},
{
"groupName": "家装家纺",
"item": [{
"fieldsTitle": "家居饰品",
"key": "家居饰品",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/1.jpg",
"cat": 0
},
{
"fieldsTitle": "凉席",
"key": "凉席",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/2.jpg",
"cat": 0
},
{
"fieldsTitle": "背枕靠枕",
"key": "靠枕",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/3.jpg",
"cat": 0
},
{
"fieldsTitle": "床上用品",
"key": "床上用品",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/4.jpg",
"cat": 0
},
{
"fieldsTitle": "摆件",
"key": "摆件",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/5.jpg",
"cat": 0
},
{
"fieldsTitle": "四件套",
"key": "四件套",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/6.jpg",
"cat": 0
},
{
"fieldsTitle": "装饰品",
"key": "装饰品",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/7.jpg",
"cat": 0
},
{
"fieldsTitle": "卫浴用品",
"key": "卫浴",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/8.jpg",
"cat": 0
},
{
"fieldsTitle": "家居家装",
"key": "家具",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/9.jpg",
"cat": 0
},
{
"fieldsTitle": "蚊帐",
"key": "蚊帐",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/10.jpg",
"cat": 0
},
{
"fieldsTitle": "墙纸贴纸",
"key": "墙纸",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/11.jpg",
"cat": 0
},
{
"fieldsTitle": "空调被",
"key": "空调被",
"icon": "https://cdn.uviewui.com/uview/common/classify/13/12.jpg",
"cat": 0
}
]
},
{
"groupName": "户外运动",
"item": [{
"fieldsTitle": "游泳装备",
"key": "游泳",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/1.jpg",
"cat": 0
},
{
"fieldsTitle": "泳镜",
"key": "泳镜",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/2.jpg",
"cat": 0
},
{
"fieldsTitle": "户外装备",
"key": "户外",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/3.jpg",
"cat": 0
},
{
"fieldsTitle": "健身服饰",
"key": "健身",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/4.jpg",
"cat": 0
},
{
"fieldsTitle": "泳衣",
"key": "泳衣",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/5.jpg",
"cat": 0
},
{
"fieldsTitle": "瑜伽垫",
"key": "瑜伽垫",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/6.jpg",
"cat": 0
},
{
"fieldsTitle": "瑜伽用品",
"key": "瑜伽",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/7.jpg",
"cat": 0
},
{
"fieldsTitle": "健身装备",
"key": "健身",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/8.jpg",
"cat": 0
},
{
"fieldsTitle": "球迷用品",
"key": "球迷",
"icon": "https://cdn.uviewui.com/uview/common/classify/14/9.jpg",
"cat": 0
}
]
} }
] ]
...@@ -58,14 +58,14 @@ const install = (Vue, vm) => { ...@@ -58,14 +58,14 @@ const install = (Vue, vm) => {
return config; return config;
} }
function getCode(res){ function getCode(res){
const result = res.data || res // const result = res.data || res
let code // let code
if(result.hasOwnProperty('statusCode')){ // if(result.hasOwnProperty('statusCode')){
code = res.statusCode // code = res.statusCode
}else if(result.hasOwnProperty('code')){ // }else if(result.hasOwnProperty('code')){
code = result.code // code = result.code
} // }
return code return res.statusCode || res.code || res.data.statusCode || res.data.code
} }
function getMsg(res){ function getMsg(res){
res = res.data || res res = res.data || res
......
...@@ -52,14 +52,20 @@ ...@@ -52,14 +52,20 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.list { .list {
display: flex; display: flex;
flex-wrap: wrap;
.txt { .txt{
color: #666; color:#666;
padding: 10rpx; padding:10rpx 30rpx;
margin: 5rpx;
&.active { background: #F4F5F7;
background-color: red; border-radius: 10rpx;
color: #fff; display: flex;
flex-wrap: wrap;
line-height: 50rpx;
max-width: 48%;
&.active{
background-color: #2272FF;
color:#fff;
} }
} }
} }
......
<!-- ******************* 文件上传 ******************* --> <!-- ******************* 文件上传 ******************* -->
<template> <template>
<view class="file-box"> <view class="file-box">
<view class="u-flex" @click="selectUpload"> <!-- <view class="u-flex">
<view class="txt u-flex-1">{{item.fieldsTitle}}</view> <view class="txt u-flex-1">{{item.fieldsTitle}}</view>
<u-icon name="arrow-right" color="#666" size="28"></u-icon> <u-icon name="arrow-right" color="#666" size="28"></u-icon>
</view> </view> -->
<view class="pics u-flex u-flex-wrap"> <view class="pics u-flex u-flex-wrap">
<u-image class="pic" v-for="(item,index) in imgList" width="170rpx" height="170" :src="item.path" :key="index"></u-image> <view class="img-list" v-for="(item,index) in imgList" :key="index">
<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> --> <u-image class="pic" width="170" height="170" :src="item.path" @click.stop="prviewImage(item.path,index)"></u-image>
</view> <view class="icon-del-box" @click.stop="delFile(index)">
<u-popup v-model="maskShow" mode="center" width="500"> <view class="icon-del"></view>
<view class="upload-box u-p-30"> <view class="icon-del rotate"></view>
<view class="title">请选择图片</view>
<view class="u-flex u-row-between">
<view class="upload-item u-text-center" @click="uploadFile('photo')">
<u-image class="pic" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image>
相册
</view> </view>
<view class="upload-item u-text-center" @click="uploadFile">
<u-image class="pic" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image>
拍摄
</view> </view>
<view class="img-list" @click="choose">
<u-image class="pic" width="170rpx" height="170" @click="selectUpload" src="https://gitee.com/xuqu/uView/blob/master/static/uview/example/min_button.png"></u-image>
</view> </view>
<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> -->
</view> </view>
</u-popup> <u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet>
</view> </view>
</template> </template>
...@@ -38,7 +33,15 @@ ...@@ -38,7 +33,15 @@
filters:{}, filters:{},
data() { data() {
return { return {
maskShow:false maskShow:false,
list: [
{
text: '相册'
},
{
text: '拍照'
}
]
} }
}, },
computed: { computed: {
...@@ -53,6 +56,13 @@ ...@@ -53,6 +56,13 @@
// 弹窗展示 // 弹窗展示
this.maskShow = true this.maskShow = true
}, },
uploadSelect(index) {
if (index === 0) {
this.uploadFile('photo')
} else {
this.uploadFile()
}
},
async uploadFile(type){ async uploadFile(type){
const self = this const self = this
if(type&&type==='photo'){ if(type&&type==='photo'){
...@@ -60,6 +70,8 @@ ...@@ -60,6 +70,8 @@
let config = { let config = {
options:{ options:{
sourceType:['album'],//['album', 'camera'] sourceType:['album'],//['album', 'camera']
count: 5,
sizeType: ['compressed']
} }
} }
await this.chooseImage('qiniu',config) await this.chooseImage('qiniu',config)
...@@ -74,7 +86,17 @@ ...@@ -74,7 +86,17 @@
this.imgList.map(item=>{ this.imgList.map(item=>{
dataValue.push(item.key) dataValue.push(item.key)
}) })
console.log(this.imgList)
this.valueChange(dataValue) this.valueChange(dataValue)
},
prviewImage(url, index) {
uni.previewImage({
urls: [url],
current: index
});
},
delFile(index) {
this.imgList.splice(index, 1)
} }
} }
} }
...@@ -87,6 +109,42 @@ ...@@ -87,6 +109,42 @@
margin-right: 0; margin-right: 0;
} }
} }
.img-list {
position: relative;
margin: 8rpx;
border: 1px solid #eee;
width: 170rpx;
height: 170rpx;
.icon-del-box {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
align-items: center;
justify-content: center;
position: absolute;
top: 10rpx;
right: 10rpx;
height: 40rpx;
width: 40rpx;
border-radius: 50%;
background-color: rgba(0, 0, 0, 0.5);
z-index: 2;
transform: rotate(-45deg);
}
.icon-del {
width: 30rpx;
height: 4rpx;
background-color: #fff;
border-radius: 2px;
}
.rotate {
position: absolute;
transform: rotate(90deg);
}
}
// .list { // .list {
// display: flex; // display: flex;
......
<!-- ******************* 输入框 ******************* --> <!-- ******************* 输入框 ******************* -->
<template> <template>
<view> <view>
<u-input v-model="dataValue" @input="valueChange" :type="type" /> <u-input :type="type" class="input-item" v-model="dataValue" @input="valueChange" :border="true" placeholder="请输入" />
</view> </view>
</template> </template>
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
}, },
computed: { computed: {
type() { type() {
if (this.item && this.item.fieldsType == 'password') { console.log(this.item)
if (this.item && this.item.fieldsType == 'password' || this.item.fieldsType == 'textarea') {
return this.item.fieldsType return this.item.fieldsType
} else { } else {
return 'text' return 'text'
...@@ -30,5 +31,8 @@ ...@@ -30,5 +31,8 @@
} }
</script> </script>
<style> <style scoped>
.input-item{
background: #F4F5F7;
}
</style> </style>
<!-- ******************* 定位 ******************* --> <!-- ******************* 定位 ******************* -->
<template> <template>
<view>
<view class="list u-flex u-row-between"> <view class="list u-flex u-row-between">
<text class="required" v-if="item.required">*</text> <image class="item-image" :src="mixingImage" v-if="item.required"></image>
<view class="u-m-r-20">{{item.fieldsTitle}}</view> <view class="u-m-r-20">{{item.fieldsTitle}}</view>
<view class="u-flex-1">{{valueTxt || ''}}</view> <!-- <u-button type="primary" size="mini" @click="$u.debounce(getLocation,1000)">自动定位</u-button> -->
<u-button type="primary" size="mini" @click="$u.debounce(getLocation,1000)">默认按钮</u-button> <view class="u-flex-1 location-name">
<u-icon name="map" color="#2979ff" size="30"></u-icon>自动定位
</view>
</view>
<view class="u-flex-1 location">{{valueTxt || '正在获取中...'}}</view>
</view> </view>
</template> </template>
...@@ -27,10 +32,15 @@ ...@@ -27,10 +32,15 @@
str = '经度:'+dataValue[0]+','+'维度:'+dataValue[1] str = '经度:'+dataValue[0]+','+'维度:'+dataValue[1]
} }
return str return str
},
mixingImage() {
return process.uniEnv.qn_base_url + 'mixing.png'
} }
}, },
watch: {}, watch: {},
mounted() {}, created() {
this.getLocation()
},
methods: { methods: {
getLocation() { getLocation() {
let self = this let self = this
...@@ -60,4 +70,17 @@ ...@@ -60,4 +70,17 @@
line-height: 40rpx; line-height: 40rpx;
color: #fa3534; color: #fa3534;
} }
.item-image {
width: 24rpx;
height: 24rpx;
margin-right: 10rpx;
}
.location-name {
color: #2272FF;
text-align: right;
}
.location {
background: #F4F5F7;
padding: 10rpx;
}
</style> </style>
<!-- ******************* 多个输入框 ******************* --> <!-- ******************* 多个输入框 ******************* -->
<template> <template>
<view class="u-flex u-flex-wrap"> <view class="u-flex u-flex-wrap">
<u-input class="input-item" v-for="(item,index) in inputOptions" v-model="item.value" @input="val=>{getValue(item)}" type="text" :key="index"/> <u-input class="input-item" v-for="(item,index) in inputOptions" v-model="item.value" @input="val=>{getValue(item)}" type="text" :key="index" :border="true" :placeholder="item.placeholder" />
</view> </view>
</template> </template>
...@@ -40,8 +40,10 @@ ...@@ -40,8 +40,10 @@
} }
</script> </script>
<style> <style scoped>
.input-item{ .input-item{
width:33.3%; width: 31%;
margin: 5rpx;
background: #F4F5F7;
} }
</style> </style>
...@@ -34,11 +34,20 @@ ...@@ -34,11 +34,20 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.list{ .list{
display: flex; display: flex;
flex-wrap: wrap;
.txt{ .txt{
color:#666; color:#666;
padding:10rpx; padding:10rpx 30rpx;
margin: 5rpx;
background: #F4F5F7;
border-radius: 10rpx;
display: flex;
flex-wrap: wrap;
line-height: 50rpx;
text-align: center;
max-width: 48%;
&.active{ &.active{
background-color: red; background-color: #2272FF;
color:#fff; color:#fff;
} }
} }
......
<!-- ******************* 扫码 ******************* --> <!-- ******************* 扫码 ******************* -->
<template> <template>
<view class=""> <view class="">
<view class="u-flex">
请输入:<u-input class="u-flex-1" v-model="dataValue" @input="valueChange" type="text" />
</view>
<view class="u-flex" @click="scanCode"> <view class="u-flex" @click="scanCode">
<view class="txt u-flex-1">扫描二维码(仅挚达充电桩可扫描)</view> <view class="txt u-flex-1">扫描二维码(仅挚达充电桩可扫描)</view>
<u-icon name="arrow-right" color="#666" size="28"></u-icon> <u-icon name="arrow-right" color="#666" size="28"></u-icon>
</view> </view>
<view class="u-flex">
<u-input class="u-flex-1 input-item" v-model="dataValue" @input="valueChange" type="text" />
</view>
</view> </view>
</template> </template>
<script> <script>
...@@ -63,4 +62,7 @@ ...@@ -63,4 +62,7 @@
line-height: 40rpx; line-height: 40rpx;
color: #fa3534; color: #fa3534;
} }
.input-item{
background: #F4F5F7;
}
</style> </style>
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
keys: [], keys: [],
token: '', token: '',
product: '', product: '',
allImages: []
} }
}, },
created(e) { created(e) {
...@@ -37,10 +38,10 @@ ...@@ -37,10 +38,10 @@
console.log(getApp().globalData.photo.currentItem) console.log(getApp().globalData.photo.currentItem)
const product = app.globalData.photo.product const product = app.globalData.photo.product
this.product = `?brandId=${product.brandId}&brand=${product.brandName}&classifyId=${product.classifyId}&systemId=${product.systemId}` this.product = `?brandId=${product.brandId}&brand=${product.brandName}&classifyId=${product.classifyId}&systemId=${product.systemId}`
// if(app.globalData.photo.currentItem) { if(app.globalData.photo.currentItem) {
// // 获取规格Id // 获取规格Id
// this.standardId = app.globalData.photo.currentItem._id this.standardId = app.globalData.photo.currentItem._id
// } }
getApp().trackPage('照片预览页') getApp().trackPage('照片预览页')
const globalTempPath = getApp().globalData.photo.tempPath const globalTempPath = getApp().globalData.photo.tempPath
...@@ -50,7 +51,6 @@ ...@@ -50,7 +51,6 @@
// if(e.standardId) { // if(e.standardId) {
// this.standardId = e.standardId // this.standardId = e.standardId
// } // }
console.log(this.files)
this.token = getApp().globalData.token this.token = getApp().globalData.token
}, },
methods: { methods: {
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
}) })
} }
} }
photo.allImages.unshift(photo.tempPath.mixWater)
if(photo.currentItem){ if(photo.currentItem){
photo.currentItem.imageList.unshift(photo.tempPath.mixWater) photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
} }
...@@ -139,7 +140,6 @@ ...@@ -139,7 +140,6 @@
}, },
submitFile() { submitFile() {
let self = this let self = this
if(self.keys.length) { if(self.keys.length) {
for (let s of self.keys) { for (let s of self.keys) {
self.$u.api.saveImage({ self.$u.api.saveImage({
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
getApp().trackPage('水印设置页') getApp().trackPage('水印设置页')
const globalData = getApp().globalData const globalData = getApp().globalData
this.icon_close_new = globalData.icon_close_new this.icon_close_new = globalData.icon_close_new
this.systemId = globalData.photo.product.systemId this.systemId = globalData.photo.currentItem.systemId
this.getItemList() this.getItemList()
}, },
methods: { methods: {
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</view> </view>
</view> </view>
</view> </view>
<photo-preview v-if="showType === 2" @changeType="changeType" @finish="goBack" /> <photo-preview v-if="showType === 2" @changeType="changeType" @finish="finish" />
<photo-setting v-if="showType === 3" @changeType="changeType" /> <photo-setting v-if="showType === 3" @changeType="changeType" />
</view> </view>
</template> </template>
...@@ -57,16 +57,20 @@ ...@@ -57,16 +57,20 @@
import setting from '@/components/photo/setting.vue' import setting from '@/components/photo/setting.vue'
export default { export default {
props: { props: {
currentItem: { // 拍照要求,示意图,system_id, standardId currentItem: { // 对应的规范item
type: Object, type: Object,
default () { default () {
return { return {
images: [ _id: '', // 规格ID
system_id: '', // 系统ID
brand_id: '', // 品牌ID
classify_id: '', // 分类ID
images: [ // 拍照要求示意图
'https://qn-static.banshouhui.com/live_mark.png', 'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png', 'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png' 'https://qn-static.banshouhui.com/live_mark.png'
], ],
main_point: [] main_point: [] // 要点
} }
} }
} }
...@@ -118,7 +122,7 @@ ...@@ -118,7 +122,7 @@
this.getMarkPath() this.getMarkPath()
this.initData() this.initData()
//this.currentItem = photo.currentItem photo.currentItem = this.currentItem
}, },
computed: { computed: {
titleTxt() { titleTxt() {
...@@ -179,6 +183,11 @@ ...@@ -179,6 +183,11 @@
uni.showTabBar() uni.showTabBar()
this.$emit('close') this.$emit('close')
}, },
finish() {
uni.showTabBar()
const photo = getApp().globalData.photo
this.$emit('close', photo.allImages)
},
changeType(type) { changeType(type) {
this.showType = type this.showType = type
}, },
......
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
{ {
"path": "pages/order/complete", "path": "pages/order/complete",
"style": { "style": {
"navigationBarTitleText": "订单-完工配置" "navigationBarTitleText": "订单-完工配置",
"navigationBarBackgroundColor": "#2272FF",
"navigationBarTextStyle": "white"
} }
},{ },{
"path": "pages/order/feedback", "path": "pages/order/feedback",
......
...@@ -163,6 +163,8 @@ ...@@ -163,6 +163,8 @@
}; };
await app.getBaseInfo(self, callBack); await app.getBaseInfo(self, callBack);
this.orderList = []
this.messageList = []
// 加载消息列表 // 加载消息列表
self.loadMessageList(); self.loadMessageList();
self.loadOrderList(); self.loadOrderList();
...@@ -184,7 +186,6 @@ ...@@ -184,7 +186,6 @@
}, },
loadOrderList() { loadOrderList() {
console.log('-----------准备加载推荐列表-----------') console.log('-----------准备加载推荐列表-----------')
return
let self = this; let self = this;
// 加载订单列表 // 加载订单列表
self.search.token = self.vuex_token; self.search.token = self.vuex_token;
...@@ -192,7 +193,7 @@ ...@@ -192,7 +193,7 @@
uni.stopPullDownRefresh() // 结束下拉刷新 uni.stopPullDownRefresh() // 结束下拉刷新
if (res.code == 200) { if (res.code == 200) {
if (res.data && res.data.length > 0) { if (res.data && res.data.length > 0) {
self.orderList.push().apply(res.data); self.orderList.push(...res.data);
} }
} else { } else {
console.log(res.message, "初始化订单列表异常"); console.log(res.message, "初始化订单列表异常");
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</u-cell-group> </u-cell-group>
</view> </view>
</view> </view>
<take-photo type="test" v-if="takeStatus" @close="closeTake"></take-photo> <take-photo type="test" v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo>
</view> </view>
</template> </template>
...@@ -45,7 +45,19 @@ ...@@ -45,7 +45,19 @@
return { return {
pic:'https://uviewui.com/common/logo.png', pic:'https://uviewui.com/common/logo.png',
show:true, show:true,
takeStatus: false takeStatus: false,
testData: {
_id: '1', // 规格ID
system_id: '2', // 系统ID
brand_id: '3', // 品牌ID
classify_id: '4', // 分类ID
images: [ // 拍照要求示意图
'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png'
],
main_point: [] // 要点
}
} }
}, },
computed: { computed: {
...@@ -68,7 +80,8 @@ ...@@ -68,7 +80,8 @@
uni.hideTabBar() uni.hideTabBar()
this.takeStatus = true this.takeStatus = true
}, },
closeTake() { closeTake(img) {
console.log(img)
this.takeStatus = false this.takeStatus = false
} }
} }
......
<template> <template>
<view class="u-wrap"> <view class="u-wrap">
<view class="u-search-box"> <u-tabs-swiper ref="tabs" :current="tabIndex" :list="list" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="120"></u-tabs-swiper>
<view class="u-search-inner">
<u-icon name="search" color="#909399" :size="28"></u-icon>
<text class="u-search-text">搜索</text>
</view>
</view>
<view class="u-menu-wrap"> <view class="u-menu-wrap">
<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop"
:scroll-into-view="itemId"> :scroll-into-view="itemId">
...@@ -23,9 +18,10 @@ ...@@ -23,9 +18,10 @@
<view class="title">{{groupItem.groupName}}</view> <view class="title">{{groupItem.groupName}}</view>
<view class="class-bd"> <view class="class-bd">
<u-form-item v-for="(item,itemIndex) in groupItem.item" :key="itemIndex" <u-form-item v-for="(item,itemIndex) in groupItem.item" :key="itemIndex"
label-position="top" :prop="item.fieldsName"> label-position="top" :prop="item.fieldsName" :border-bottom="false">
<view class="label" v-if="item.fieldsType!=='location'"> <view class="label" v-if="item.fieldsType!=='location'">
<text class="required" v-if="item.required">*</text> <!-- <text class="required" v-if="item.required">*</text> -->
<image class="item-image" :src="mixingImage" v-if="item.required"></image>
{{item.fieldsTitle}} {{item.fieldsTitle}}
</view> </view>
<template v-if="item.fieldsType"> <template v-if="item.fieldsType">
...@@ -96,6 +92,18 @@ ...@@ -96,6 +92,18 @@
export default { export default {
data() { data() {
return { return {
list: [
{
name: '基础信息'
},
{
name: '勘察信息'
},
{
name: '安装信息'
}
],
tabIndex: 0,
scrollTop: 0, //tab标题的滚动条位置 scrollTop: 0, //tab标题的滚动条位置
oldScrollTop: 0, oldScrollTop: 0,
current: 0, // 预设当前项的值 current: 0, // 预设当前项的值
...@@ -163,7 +171,12 @@ ...@@ -163,7 +171,12 @@
this.getMenuItemTop() this.getMenuItemTop()
}, },
updated() { updated() {
console.log(this.form.name, 'form.name') //console.log(this.form.name, 'form.name')
},
computed: {
mixingImage() {
return process.uniEnv.qn_base_url + 'mixing.png'
}
}, },
methods: { methods: {
// 字段的值更新 // 字段的值更新
...@@ -193,7 +206,7 @@ ...@@ -193,7 +206,7 @@
// 将fieldType类型统一转换为公共组件判定类型 // 将fieldType类型统一转换为公共组件判定类型
let formType = '' let formType = ''
type = type.toLocaleLowerCase() type = type.toLocaleLowerCase()
console.log(type,'type') //console.log(type,'type')
switch (type) { switch (type) {
case 'text': case 'text':
case 'password': case 'password':
...@@ -207,6 +220,9 @@ ...@@ -207,6 +220,9 @@
case 'select': case 'select':
formType = 'select' formType = 'select'
break break
case 'radio':
formType = 'radio'
break
case 'checkbox': case 'checkbox':
formType = 'checkbox' formType = 'checkbox'
break break
...@@ -226,11 +242,11 @@ ...@@ -226,11 +242,11 @@
case 'time': case 'time':
formType = 'time' formType = 'time'
break break
// case 'file': case 'file':
// formType = 'XhFiles' formType = 'XhFiles'
// break break
} }
console.log(formType,'formType') //console.log(formType,'formType')
return formType return formType
}, },
// ------------------------- 以下方法为展示滚动切换 ------------------------- // ------------------------- 以下方法为展示滚动切换 -------------------------
...@@ -356,6 +372,13 @@ ...@@ -356,6 +372,13 @@
} }
.class-item { .class-item {
padding: 50rpx;
.title {
font-weight: bold;
font-size: 32rpx;
line-height: 32rpx;
color: #333;
}
.label { .label {
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
...@@ -368,6 +391,12 @@ ...@@ -368,6 +391,12 @@
line-height: 40rpx; line-height: 40rpx;
color: #fa3534; color: #fa3534;
} }
.item-image {
width: 24rpx;
height: 24rpx;
margin-right: 10rpx;
}
} }
// ---------------------------- 表单样式end ---------------------------- // ---------------------------- 表单样式end ----------------------------
...@@ -426,20 +455,20 @@ ...@@ -426,20 +455,20 @@
.u-tab-item-active { .u-tab-item-active {
position: relative; position: relative;
color: #000; color: #2272FF;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
background: #fff; background: #fff;
} }
.u-tab-item-active::before { // .u-tab-item-active::before {
content: ""; // content: "";
position: absolute; // position: absolute;
border-left: 4px solid $u-type-primary; // border-left: 4px solid $u-type-primary;
height: 32rpx; // height: 32rpx;
left: 0; // left: 0;
top: 39rpx; // top: 39rpx;
} // }
.u-tab-view { .u-tab-view {
height: 100%; height: 100%;
......
...@@ -13,24 +13,23 @@ ...@@ -13,24 +13,23 @@
</view> </view>
</view> </view>
<view class="u-tabs-box" v-show="curNow == 0"> <view class="u-tabs-box" v-show="curNow == 0">
<u-tabs-swiper activeColor="#2272FF" bg-color="none" inactive-color="#999" bar-height="4" bar-width="44" <u-tabs activeColor="#2272FF" bg-color="none" inactive-color="#999" bar-height="4" bar-width="44"
:offset="[-1,10]" ref="tabs" :list="list" count="total" :current="current" @change="change" :offset="[-1,10]" :list="list" count="total" :current="current" @change="change"
:is-scroll="false" swiperWidth="750"></u-tabs-swiper> :is-scroll="false"></u-tabs>
</view> </view>
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" <!-- <swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"> -->
@animationfinish="animationfinish"> <!-- <swiper-item class="swiper-item" v-for="(res, ind) in orderList" :key="ind"> -->
<swiper-item class="swiper-item" v-for="(res, ind) in orderList" :key="ind">
<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring> <scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring>
<view class="page-box"> <view class="page-box">
<view v-for="(item, index) in res" :key="item.orderId"> <view v-for="(item, index) in orderList" :key="item.orderId">
<OrderCell :orderData="item" :orderType="orderType" :location="dataValue" <OrderCell :orderData="item" :orderType="orderType" :location="dataValue"
@click="handleClick(item)" @action="handleAction(item)"> </OrderCell> @click="handleClick(item)" @action="handleAction(item)"> </OrderCell>
</view> </view>
<u-loadmore :status="loadStatus[ind]" bgColor="#F4F5F7"></u-loadmore> <u-loadmore :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> <!-- </swiper-item>
</swiper> </swiper> -->
<!-- </view> --> <!-- </view> -->
</TabBarPage> </TabBarPage>
...@@ -48,8 +47,6 @@ ...@@ -48,8 +47,6 @@
return { return {
showSview: true, showSview: true,
curNow: 0, curNow: 0,
timestamp: 1000,
triggered: false,
pageNumber: 0, pageNumber: 0,
pageSize: 10, pageSize: 10,
//waitAccept、waitAppointment、waitCheckIn、waitFinish、exception、finish //waitAccept、waitAppointment、waitCheckIn、waitFinish、exception、finish
...@@ -61,8 +58,7 @@ ...@@ -61,8 +58,7 @@
4: 'exception', 4: 'exception',
5: 'finish' 5: 'finish'
}, },
orderList: [[],[],[],[],[],[]], orderList: [],
dataList: [],
list: [{ list: [{
name: '待预约', name: '待预约',
total: 0, total: 0,
...@@ -85,12 +81,8 @@ ...@@ -85,12 +81,8 @@
} }
], ],
current: 0, current: 0,
swiperCurrent: 0, loadStatus: 'loading',
tabsHeight: 0,
dx: 0,
loadStatus: ['loading','loading','loading','loading','loading','loading'],
dataValue: [], dataValue: [],
total: 0
}; };
}, },
onLoad() { onLoad() {
...@@ -107,22 +99,23 @@ ...@@ -107,22 +99,23 @@
return this.currentIndex + 1 return this.currentIndex + 1
}, },
currentIndex() { currentIndex() {
return this.curNow == 0 ? this.swiperCurrent : 5 return this.curNow == 0 ? this.current : 5
} }
}, },
methods: { methods: {
sectionChange(index) { sectionChange(index) {
this.curNow = index; this.curNow = index;
this.pageNumber = 0 this.pageNumber = 0
if (index === 1) { this.orderList = []
this.showSview = false this.loadStatus = 'loading'
// 加载已完工的数据 this.getOrderList(index === 0 ? 0 : 5)
this.getOrderList(5) },
} else { // tab栏切换
this.showSview = true change(index) {
// 加载已完工的数据 this.current = index;
this.getOrderList(0) this.orderList = []
} this.loadStatus = 'loading'
this.getOrderList(index);
}, },
/** /**
* 获取当前位置的经纬度 * 获取当前位置的经纬度
...@@ -145,10 +138,8 @@ ...@@ -145,10 +138,8 @@
}, },
reachBottom(e) { reachBottom(e) {
console.log(e) if (this.loadStatus != 'loadmore') return
console.log(this.loadStatus[this.currentIndex]) this.loadStatus == 'loading'
if (this.loadStatus[this.currentIndex] != 'loadmore') return
this.loadStatus[this.currentIndex] == 'loading'
this.getOrderList(this.currentIndex) this.getOrderList(this.currentIndex)
}, },
// 页面数据 // 页面数据
...@@ -196,11 +187,11 @@ ...@@ -196,11 +187,11 @@
...res.data.list,...res.data.list,...res.data.list,...res.data.list,...res.data.list,...res.data.list] ...res.data.list,...res.data.list,...res.data.list,...res.data.list,...res.data.list,...res.data.list]
/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/ /*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
// 后台需要返回order_type,防止数据返回延迟期间点击了其他的tab // 后台需要返回orderType,防止数据返回延迟期间点击了其他的tab
if (res.data) { if (res.data) {
self.orderList[res.data.orderType].push(...res.data.list) self.orderList.push(...res.data.list)
self.list[res.data.orderType].total = res.data.total self.list[res.data.orderType].total = res.data.total
self.loadStatus[res.data.orderType] = res.data.total > self.orderList[res.data.orderType].length ? 'loadmore' : 'nomore' self.loadStatus = res.data.total > self.orderList.length ? 'loadmore' : 'nomore'
} }
} else { } else {
console.log(res.message, "获取订单数量失败!"); console.log(res.message, "获取订单数量失败!");
...@@ -235,27 +226,6 @@ ...@@ -235,27 +226,6 @@
} }
}); });
}, },
// tab栏切换
change(index) {
this.swiperCurrent = index;
this.getOrderList(index);
},
transition({
detail: {
dx
}
}) {
this.$refs.tabs.setDx(dx);
},
animationfinish({
detail: {
current
}
}) {
this.$refs.tabs.setFinishCurrent(current);
this.swiperCurrent = current;
this.current = current;
},
viewOderItem(orderId) { // 跳转工单详情页面 viewOderItem(orderId) { // 跳转工单详情页面
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/detail?id=' + orderId url: 'pages/order/detail?id=' + orderId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment