修复图片显示错误

4 years ago · 9315aefd18
11 changed files with 645 additions and 443 deletions
--- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
+++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
@ -21,7 +21,7 @@ namespace 齐越慧眼
        public static string JwtToken { 
            get
            {
-                //return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MDY2ODk3OX0.EXnvVkAAUkDndalUo_SalFKOBsbzpx_c-L_ddCwa7RY";
+              
                if (string.IsNullOrEmpty(jwtToken))
                {
                    jwtToken = GetMemoryToken().Replace("\r\n","");
--- a/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs
+++ b/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs
@ -109,6 +109,11 @@ namespace 齐越慧眼.UserControls
            {
                try
                {
+                    if (url.StartsWith("http:http"))
+                    { 
+                        url= url.Substring("http:".Length);
+                    }
+
                    byte[] arr = client.DownloadData(url.Replace("_.webp", ""));
                    arr = GetSmallImgArr(arr);

--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
@ -65,7 +65,7 @@
              "
            >
              <a target="_black" :href="item.GoodsUrl">
-                <img :src="'http:' + item.ItemImg" width="200" height="165"
+                <img :src="getImgPath( item.ItemImg)" width="200" height="165"
              /></a>
              <a-row>
                <a-col :span="12" style="text-align: left"
@ -278,10 +278,10 @@
                    <a-dropdown 
                      style="margin-left: 10px">
                      <a-menu slot="overlay" >
-                        <a-menu-item key="1" @click="getImgBase64(item.ItemImg,1)">
+                        <a-menu-item key="1" @click="getImgBase64(getImgPath( item.ItemImg),1)">
                          阿里巴巴
                        </a-menu-item>
-                        <a-menu-item key="2" @click="getImgBase64(item.ItemImg,2)">
+                        <a-menu-item key="2" @click="getImgBase64(getImgPath( item.ItemImg),2)">
                            京东
                        </a-menu-item>
                      </a-menu>
@ -390,7 +390,19 @@
          </a-row>
        </a-col>
      </a-row>
+
+      
+    <div style="float:right;margin-top:30px">
+      <a-pagination
+      v-model="pagination.current"
+      :default-current="1"
+      :total="pagination.total"
+      :page-size="pagination.pageSize"
+      @change="changePage"
+    />
+    </div>
    </div>
+
  </div>
 </template>

@ -403,6 +415,7 @@ export default {
      pagination: {
        current: 1,
        pageSize: 10,
+        total:0,
        showTotal: (total, range) =>
          `总数:${total} 当前:${range[0]}-${range[1]}`,
      },
@ -424,6 +437,15 @@ export default {
    //this.getDatas(0)
  },
  methods: {
+    getImgPath(img){
+          if(img.indexOf("http")>=0)
+          {
+return img;
+          }else
+          {
+return 'http:'+img;
+          }
+      },
    // 实现select选择框可下拉单选，也可输入赋值
    handleSearch(value, ext, item) {
      this.handleChange(value, ext, item);
@ -447,8 +469,16 @@ export default {
    changeTab(e) {
      this.getDatas(e);
      this.currentTab = e;
+      this.pagination.current=1;
+
+    },
+    changePage(page, pageSize)
+    {
+      this.pagination.current=page;
+      this.getDatas(this.currentTab);
    },
    getDatas(type) {
+      var that=this
      this.http
        .post("/HuiYan/teamitems/GetItems", {
          PageIndex: this.pagination.current,
@ -459,6 +489,7 @@ export default {
          ...this.filters,
        })
        .then((res) => {
+          that.pagination.total=res.Total
          res.Data.forEach((item) => {
            item.isEdit = false;
            item.Extensions.forEach((ext) => {
@ -552,7 +583,7 @@ export default {
      });
    },
    getImgBase64(src,type) {
-      hyCoreModel.getImgBase64("http:" + src,type).then((res) => {
+      hyCoreModel.getImgBase64(src,type).then((res) => {
        console.log(res);
      });
    },
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.4f57b433.css
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.4f57b433.css
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.a281d79c.css
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.a281d79c.css
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.cbd86d30.css
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.cbd86d30.css
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/index.html
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>client</title><link href="/css/app.a281d79c.css" rel="preload" as="style"><link href="/css/app.css" rel="preload" as="style"><link href="/css/chunk-vendors.09af4a6b.css" rel="preload" as="style"><link href="/css/chunk-vendors.css" rel="preload" as="style"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/css/chunk-vendors.09af4a6b.css" rel="stylesheet"><link href="/css/chunk-vendors.css" rel="stylesheet"><link href="/css/app.a281d79c.css" rel="stylesheet"><link href="/css/app.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/app.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>client</title><link href="/css/app.4f57b433.css" rel="preload" as="style"><link href="/css/app.css" rel="preload" as="style"><link href="/css/chunk-vendors.09af4a6b.css" rel="preload" as="style"><link href="/css/chunk-vendors.css" rel="preload" as="style"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/css/chunk-vendors.09af4a6b.css" rel="stylesheet"><link href="/css/chunk-vendors.css" rel="stylesheet"><link href="/css/app.4f57b433.css" rel="stylesheet"><link href="/css/app.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/app.js"></script></body></html>
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
--- a/客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj
+++ b/客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj
@ -41,10 +41,8 @@
    <None Remove="vuepage\client\.eslintrc.js" />
    <None Remove="vuepage\client\.gitignore" />
    <None Remove="vuepage\client\.postcssrc.js" />
-    <None Remove="vuepage\dist\css\app.90b53025.css" />
-    <None Remove="vuepage\dist\css\app.a281d79c.css" />
+    <None Remove="vuepage\dist\css\app.4f57b433.css" />
    <None Remove="vuepage\dist\css\app.b0aefef5.css" />
-    <None Remove="vuepage\dist\css\app.cbd86d30.css" />
    <None Remove="vuepage\dist\css\app.css" />
    <None Remove="vuepage\dist\css\chunk-vendors.09af4a6b.css" />
    <None Remove="vuepage\dist\css\chunk-vendors.css" />
@ -56,6 +54,7 @@
    <None Remove="vuepage\client\README.md" />
    <None Remove="vuepage\client\vue.config.js" />
    <None Remove="vuepage\client\yarn.lock" />
+    <None Remove="vuepage\dist\jp.png" />
    <None Remove="vuepage\dist\js\app.js" />
    <None Remove="vuepage\dist\js\app.js.map" />
    <None Remove="vuepage\dist\js\chunk-vendors.js" />
@ -72,9 +71,7 @@
  </ItemGroup>

  <ItemGroup>
-    <EmbeddedResource Include="vuepage\dist\css\app.90b53025.css" />
-    <EmbeddedResource Include="vuepage\dist\css\app.a281d79c.css" />
-    <EmbeddedResource Include="vuepage\dist\css\app.cbd86d30.css" />
+    <EmbeddedResource Include="vuepage\dist\css\app.4f57b433.css" />
    <EmbeddedResource Include="vuepage\dist\css\app.css" />
    <EmbeddedResource Include="vuepage\dist\css\chunk-vendors.09af4a6b.css" />
    <EmbeddedResource Include="vuepage\dist\css\chunk-vendors.css" />
@ -86,6 +83,9 @@
  <ItemGroup>
    <EmbeddedResource Include="vuepage\dist\favicon.ico" />
    <EmbeddedResource Include="vuepage\dist\index.html" />
+    <EmbeddedResource Include="vuepage\dist\jp.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </EmbeddedResource>
    <EmbeddedResource Include="vuepage\dist\js\app.js" />
    <EmbeddedResource Include="vuepage\dist\js\app.js.map" />
    <EmbeddedResource Include="vuepage\dist\js\chunk-vendors.js" />