diff --git a/apis/add-paper.js b/apis/add-paper.js index aeced67..172a6fc 100644 --- a/apis/add-paper.js +++ b/apis/add-paper.js @@ -44,3 +44,21 @@ export function productStatus(data) { data }) } +// 编辑店铺、 +export function updataStore(data) { + return http.post({ + url: '/base-paper-trading/update/store?mallSupplierId='+data.mallSupplierId, + data + }) +} + +/** + * 获取我店铺列表 + * swagger:http://api-ops-yyt-test.qniao.cn/base-paper-trading/swagger-ui/index.html?urls.primaryName=CustomerApi#/店铺/getMyStoreListUsingGET + */ +export function getStoreList(data) { + return http.get({ + url: '/base-paper-trading/get/my/store-list', + data + }) +} diff --git a/apis/setting.js b/apis/setting.js new file mode 100644 index 0000000..4ea84ee --- /dev/null +++ b/apis/setting.js @@ -0,0 +1,8 @@ +import http from '../utils/http/index.js' +// 修改员工姓名 +export function employeeName(data) { + return http.post({ + url: '/yyt-uec/update/my/employee-name?userId='+data.userId +'&enterpriseId=' +data.enterpriseId, + data + }) +} diff --git a/apis/trade.js b/apis/trade.js index 4330b0c..5ed1afb 100644 --- a/apis/trade.js +++ b/apis/trade.js @@ -33,7 +33,7 @@ export function getMyreplyList(data) { // 提交报价 export function updataEnquiryReply(data) { return http.post({ - url: '/base-paper-trading/update/enquiry-reply', + url: '/base-paper-trading/update/enquiry-reply?userId='+data.userId, data }) } diff --git a/manifest.json b/manifest.json index db3feb2..ae8c6ec 100644 --- a/manifest.json +++ b/manifest.json @@ -1,119 +1,119 @@ { - "name" : "纸掌柜", - "appid" : "__UNI__8C1E198", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - "networkTimeout" : { - "request" : 6000 + "name": "纸掌柜", + "appid": "__UNI__8C1E198", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + "networkTimeout": { + "request": 6000 + }, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 }, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - "compatible" : { - "ignoreVersion" : true - }, - /* 模块配置 */ - "modules" : { - "Maps" : {}, - "Geolocation" : {}, - "FaceID" : {}, - "iBeacon" : {} + "compatible": { + "ignoreVersion": true + }, + /* 模块配置 */ + "modules": { + "Maps": {}, + "Geolocation": {}, + "FaceID": {}, + "iBeacon": {} + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters": ["armeabi-v7a", "x86"] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": { + "maps": { + "amap": { + "appkey_ios": "0182ee2a9fdd5fd3ef6a8bd5a2f98325", + "appkey_android": "877848546f7f3717101a17c33e1d4df3" + } }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters" : [ "armeabi-v7a", "x86" ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : { - "maps" : { - "amap" : { - "appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325", - "appkey_android" : "877848546f7f3717101a17c33e1d4df3" - } - }, - "payment" : { - "weixin" : { - "__platform__" : [ "ios", "android" ], - "appid" : "", - "UniversalLinks" : "" - } - }, - "ad" : {}, - "geolocation" : { - "amap" : { - "__platform__" : [ "ios", "android" ], - "appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325", - "appkey_android" : "877848546f7f3717101a17c33e1d4df3" - } - }, - "share" : {} - } + "payment": { + "weixin": { + "__platform__": ["ios", "android"], + "appid": "", + "UniversalLinks": "" + } }, - "uniStatistics" : { - "enable" : true - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "", - "setting" : { - "urlCheck" : false + "ad": {}, + "geolocation": { + "amap": { + "__platform__": ["ios", "android"], + "appkey_ios": "0182ee2a9fdd5fd3ef6a8bd5a2f98325", + "appkey_android": "877848546f7f3717101a17c33e1d4df3" + } }, - "usingComponents" : true + "share": {} + } }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false + "uniStatistics": { + "enable": true + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "", + "setting": { + "urlCheck": false }, - "vueVersion" : "2", - "h5" : { - "router" : { - "mode" : "history" - } + "usingComponents": true + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "2", + "h5": { + "router": { + "mode": "history" } + } } diff --git a/pages.json b/pages.json index 37c7963..c043322 100644 --- a/pages.json +++ b/pages.json @@ -258,7 +258,27 @@ "enablePullDownRefresh": false } } - ], + ,{ + "path" : "pages/user-info/index", + "style" : + { + "navigationBarTitleText": "用户名", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/about/index", + "style" : + { + "navigationBarTitleText": "关于", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", diff --git a/pages/about/index.vue b/pages/about/index.vue new file mode 100644 index 0000000..c608e22 --- /dev/null +++ b/pages/about/index.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index 0d3701a..643de8b 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -14,7 +14,7 @@ 纸品名称 - + @@ -25,7 +25,7 @@ 是否主营 - + @@ -134,7 +134,7 @@ text="right" placeholder="请输入账期售价" > - 元/张 + 元/{{ item.stockUnit === '1' ? '张' : '吨' }} @@ -151,7 +151,7 @@ text="right" placeholder="请输入纸品库存" > - 张 + {{ item.stockUnit === '1' ? '张' : '吨' }} @@ -168,7 +168,7 @@ text="right" placeholder="请输入最低起送量" > - 张 + {{ item.stockUnit === '1' ? '张' : '吨' }} @@ -281,11 +281,11 @@ @@ -340,7 +383,7 @@ export default { z-index: 9999; right: 32rpx; bottom: 122rpx; - background-color: #007AFF; + background-color: #007aff; border-radius: 50%; padding: 10rpx; text-align: center; diff --git a/pages/mall/no-data.vue b/pages/mall/no-data.vue new file mode 100644 index 0000000..a22858c --- /dev/null +++ b/pages/mall/no-data.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue index 2667869..442287f 100644 --- a/pages/my-offer/index.vue +++ b/pages/my-offer/index.vue @@ -140,10 +140,7 @@ export default { //跳转我的报价详情 myPriceInfo(item) { - console.log(item) - uni.navigateTo({ - url: '/pages/quotation-details/index' - }) + go2('quotation-details',item) } } } diff --git a/pages/paper-detail/index.vue b/pages/paper-detail/index.vue index 0ba62b4..0090934 100644 --- a/pages/paper-detail/index.vue +++ b/pages/paper-detail/index.vue @@ -4,7 +4,7 @@ 纸品详情 - 分享 + 分享 @@ -14,15 +14,15 @@ 纸厂信息： - 博汇 + {{form.manufacturerName}} 品牌信息： - 朱雀 + {{form.brandName}} 纸种信息： - 白卡纸 + {{form.categoryName}} @@ -32,19 +32,19 @@ - 克重 - 规格 + 克重 + 售价 库存 - 是否特价 + 是否特价 - - 2500g - 779*1092 - 4400.00元 - 8900张 - 是 + + {{item.weight}} + + {{item.listPrice}}元 + {{item.stock}}张 + {{item.isPromoting === true ?'是':'否'}} @@ -53,28 +53,25 @@ 纸品图片 - - - - + 商品买点 - 月结30天价格，不加服务费！ + {{form.sellingProposition}} 商品描述 - 售价全部为含税价，支持先用后付，欢迎来电查询！近期价格波动较大，请下单前先咨询价格。 + {{form.description}} 送货说明 - 分切纸不足重量的，另加调机费；低于送货重量或超出送货范围的，运费另计。 + {{form.shippingNote}} 其他说明 - 无其他说明。 + {{form.otherNote}} @@ -91,25 +88,49 @@ export default { return { form:{}, skuList:[], - imgList:[] + imgList:[], + option:'' } }, + onLoad(option) { + this.getDteailList(option) + this.option = option + }, methods: { back, //获取详情 - getDteailList(res) { + getDteailList(option) { var params = { - mallSupplierIds : null, - productId : null + mallSupplierIds : this.$store.state.supplierInfo.supplierId, + productId : option.id } - this.getSupplierDteail(params).then(res => { + getSupplierDteail(params).then(res => { if (res) { this.form = res this.skuList = res.skuList this.imgList = res.imgList + this.$set(this.form,'categoryName',this.option.categoryName) } }) }, + // 分享 + shareTap() { + uni.share({ + provider: "weixin", + scene: "WXSceneSession", + type: 0, + href: "http://uniapp.dcloud.io/", + title: "uni-app分享", + summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！", + imageUrl: "https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-uni-app-doc/d8590190-4f28-11eb-b680-7980c8a877b8.png", + success: function (res) { + console.log("success:" + JSON.stringify(res)); + }, + fail: function (err) { + console.log("fail:" + JSON.stringify(err)); + } + }); + } } } diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue index db34eb0..f3eef36 100644 --- a/pages/quotation-details/index.vue +++ b/pages/quotation-details/index.vue @@ -28,12 +28,12 @@ - {{ items.brandName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }} + {{ items.brandName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }} 重量(吨)： - 1.6544 + {{ items.wight }} 单价(元/吨)： @@ -51,18 +51,18 @@ 其他费用： - ¥ 80.00 + ¥ {{ upDataObj.otherFee }} 合计： - ¥ 13800.32 + ¥ {{ upDataObj.totalAllPrice }} 有效时间： - 24小时 + {{ upDataObj.enquiryValidTime }} @@ -91,46 +91,36 @@ export default { value: '', visible: true, title: 'picker-view', - upDataObj:{ - belongEnterpriseName:'东莞市隆兴纸业有限公司', - deliveryArea:'广东省/广州市/天河区', - deliveryDay:'2021/12/29 12:30', - enquiryValidTime:[12,11,10], - itemList:[ - { - brandName:'丽品白卡', - categoryName:"", - gramWeight:'200g', - length:'787', - quantity:'5000张', - width:'1092', - unitFee:'1000', - totalPrice:'1202' - }, - { - brandName:'丽品白卡', - categoryName:"", - gramWeight:'200g', - length:'787', - quantity:'5000张', - width:'1092', - unitFee:'1000', - totalPrice:'1202' - } - ] - }, + upDataObj: { + belongEnterpriseName: '东莞市隆兴纸业有限公司', + deliveryArea: '广东省/广州市/天河区', + deliveryDay: '2021/12/29 12:30', + enquiryValidTime: [12, 11, 10], + itemList: [] + } } }, + onLoad(Option) { + this.getDetail(Option.id) + }, methods: { back, // 获取详情 - getDetail(id){ - this.enquiryReplyDetail(id) - .then(({ list, total }) => { - this.$refs.orderRef.loadSuccess({ list, total }) + getDetail(id) { + enquiryReplyDetail(id) + .then(res => { + if (res) { + this.upDataObj = res + var timeb = this.upDataObj.enquiryValidTime.split(' ') + var timeabs = timeb[1].split(':') + this.$set(this.upDataObj, 'enquiryValidTimeSplit', timeabs) + this.$set(this.upDataObj, 'otherFee', 0) + this.$set(this.upDataObj, 'totalAllPrice', 0) + this.priceFree() + } }) - .catch(() => { - this.$refs.orderRef.loadFail() + .catch(err => { + reject(err) }) }, // 商品操作按钮 @@ -150,6 +140,14 @@ export default { bindChange(e) { console.log(e.detail.value) }, + priceFree() { + for (let i = 0; i < this.upDataObj.itemList.length; i++) { + var totalAllPrice = parseFloat(this.upDataObj.totalAllPrice) + parseFloat(this.upDataObj.itemList[i].totalPrice) + this.upDataObj.totalAllPrice = totalAllPrice.toFixed(2) + var otherFee = parseFloat(this.upDataObj.otherFee) + parseFloat(this.upDataObj.itemList[i].otherFee) + this.upDataObj.otherFee = otherFee.toFixed(2) + } + }, close() { this.$refs.popup.close() this.$refs.popupPrice.close() @@ -168,13 +166,12 @@ export default { this.$refs.popupTime.close() }, // 修改报价按钮 - editPrice(){ - var params= { - title:"修改报价" + editPrice() { + var params = { + title: '修改报价' } - go2('submit-quotation', params) - }, - + go2('submit-quotation', params) + } } } @@ -557,16 +554,16 @@ export default { padding: 32rpx; line-height: 42rpx; } - .edit-price{ + .edit-price { font-size: 28rpx; - color: #007AFF; + color: #007aff; text-align: right; line-height: 40prx; font-weight: 500; } - .price-tips{ + .price-tips { font-size: 30rpx; - color: #FF5368; + color: #ff5368; letter-spacing: 0; text-align: right; font-weight: 500; diff --git a/pages/setting/index.vue b/pages/setting/index.vue index 41a80ac..ed871ec 100644 --- a/pages/setting/index.vue +++ b/pages/setting/index.vue @@ -1,9 +1,78 @@ - + diff --git a/pages/store-settings/index.vue b/pages/store-settings/index.vue index ba305a1..62e3d91 100644 --- a/pages/store-settings/index.vue +++ b/pages/store-settings/index.vue @@ -24,7 +24,7 @@ 店铺logo - + 建议尺寸：200*200像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面 @@ -45,7 +44,7 @@ 背景图片 - + 建议尺寸：750*370像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面 @@ -53,18 +52,21 @@ - + @@ -57,7 +79,7 @@ export default { .check-mall-image { width: 100rpx; height: 100rpx; - border-radius: 50rpx; + border-radius: 50%; } .check-mall-text { line-height: 60rpx; diff --git a/pages/trade/index.vue b/pages/trade/index.vue index ac043a7..4ff25e0 100644 --- a/pages/trade/index.vue +++ b/pages/trade/index.vue @@ -1,6 +1,6 @@