diff --git a/common/css/main.css b/common/css/main.css index e5f483c..4d27303 100644 --- a/common/css/main.css +++ b/common/css/main.css @@ -5,7 +5,6 @@ a{ } img{ text-align: center; - margin:0px auto; } body, html { width: 100%; diff --git a/common/function/myPubFunction.js b/common/function/myPubFunction.js index f98fd8a..86e2a9b 100644 --- a/common/function/myPubFunction.js +++ b/common/function/myPubFunction.js @@ -1,3 +1,5 @@ +import { reject } from "lodash"; + /** * 自定义公共函数 */ @@ -78,5 +80,27 @@ myfn.convertCurrency = function(money) { } return chineseStr; } +/** + * 网络路径转base64 + * @param {Object} url + */ +myfn.urlTobase64 = function(url) { + return new Promise((reso, reject) => { + + uni.request({ + url: url, + method: 'GET', + responseType: 'arraybuffer', + success: async res => { + let base64 = uni.arrayBufferToBase64(res.data); //把arraybuffer转成base64 + reso(base64) + }, + fail() { + reject() + } + }); + }) + +} export default myfn; \ No newline at end of file diff --git a/components/category-bar/category-bar.vue b/components/category-bar/category-bar.vue index 07fb3a4..c586766 100644 --- a/components/category-bar/category-bar.vue +++ b/components/category-bar/category-bar.vue @@ -67,17 +67,17 @@
  • 金久信自营
    • -
  • - +
  • + 现货市场
    • -
  • - +
  • + 下询价单
    • -
  • +
  • 找加工
  • diff --git a/components/top-bar/top-bar.vue b/components/top-bar/top-bar.vue index ce4bd46..cadd134 100644 --- a/components/top-bar/top-bar.vue +++ b/components/top-bar/top-bar.vue @@ -40,17 +40,17 @@
    - `50支 +
    {{item.user.person.personName}} @@ -201,6 +201,7 @@ pageSize: 10, }, success: (data) => { + this.enquirySheetData = data.rows } }); diff --git a/pages/process/detail.vue b/pages/process/detail.vue new file mode 100644 index 0000000..02fc712 --- /dev/null +++ b/pages/process/detail.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/pages/process/list.vue b/pages/process/list.vue new file mode 100644 index 0000000..d88e6ab --- /dev/null +++ b/pages/process/list.vue @@ -0,0 +1,340 @@ + + + + + \ No newline at end of file diff --git a/pages/process/my.vue b/pages/process/my.vue new file mode 100644 index 0000000..9a5386b --- /dev/null +++ b/pages/process/my.vue @@ -0,0 +1,306 @@ + + + + + \ No newline at end of file diff --git a/pages/process/quote.vue b/pages/process/quote.vue new file mode 100644 index 0000000..d173352 --- /dev/null +++ b/pages/process/quote.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/pages/process/release.vue b/pages/process/release.vue new file mode 100644 index 0000000..122c616 --- /dev/null +++ b/pages/process/release.vue @@ -0,0 +1,272 @@ + + + + + \ No newline at end of file diff --git a/pages/spot/goods/goods.vue b/pages/spot/goods/goods.vue index 1f789dc..4177670 100644 --- a/pages/spot/goods/goods.vue +++ b/pages/spot/goods/goods.vue @@ -32,7 +32,7 @@ - + @@ -54,7 +54,7 @@ :key="cindex">{{citem.name}} - + {{item.name}} @@ -238,7 +238,7 @@ .tags { display: flex; - + flex-wrap: wrap; .el-tag { margin-right: 10px; } diff --git a/pages/user/components/seal.vue b/pages/user/components/seal.vue new file mode 100644 index 0000000..c25ceb4 --- /dev/null +++ b/pages/user/components/seal.vue @@ -0,0 +1,205 @@ + + + + + \ No newline at end of file diff --git a/pages/user/user.vue b/pages/user/user.vue index e51271f..dfc3251 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -16,11 +16,16 @@ 我的名片 + + @@ -31,8 +36,9 @@