Merge branch 'master' of http://120.46.155.214:3000/snow/approval-mobile

dist/assets/index-BYV1ATJC.js

@@ -0,0 +1 @@
+import{s as c,o as f}from"./baseUrl-CXJhr-C5.js";import{d as g,a as w,c as h,b as e,w as l,u as a,W as _,H as x,p as V,q as d,X as b,Y as k,o as y,G as T,J as n,k as i,B as v,h as C,Z as B}from"./index-AtzxvIcf.js";import{u as q}from"./index-DM4o9yJk.js";const A=u=>c.post({url:f+"/admin/login",data:u}),F={class:"w-full h-full relative overflow-hidden"},S=g({__name:"index",setup(u){const m=x();B();const t=w({username:"",password:""});async function p(){try{V({message:"登录中...",forbidClick:!0});const{code:o,data:s}=await A(t);d(),o==0&&(["264","132"].includes(String(s.id))?(k(s.token),m.push("/home")):b({message:"账号存在,但该账号不能使用本系统",duration:2e3}))}catch(o){console.log(o),d()}}return q("登录"),(o,s)=>(y(),h("div",F,[e(a(_),{class:"max-w-[95%] w-[400px] fixed top-[300px] left-[50%]",style:{transform:"translate(-50%, -50%)"},onSubmit:p},{default:l(()=>[e(a(T),null,{default:l(()=>[e(a(n),null,{default:l(()=>[e(a(i),{modelValue:t.username,"onUpdate:modelValue":s[0]||(s[0]=r=>t.username=r),label:"手机号",placeholder:"请输入手机号",maxlength:"11",rules:[{required:!0,message:"请填写手机号",trigger:"change"}]},null,8,["modelValue"])]),_:1}),e(a(n),null,{default:l(()=>[e(a(i),{modelValue:t.password,"onUpdate:modelValue":s[1]||(s[1]=r=>t.password=r),label:"密码",placeholder:"请输入密码",type:"password",rules:[{required:!0,message:"请填写用户名",trigger:"change"}]},null,8,["modelValue"])]),_:1}),e(a(n),{class:"mt-[16px]"},{default:l(()=>[e(a(v),{block:"",type:"primary","native-type":"submit"},{default:l(()=>[C("登录")]),_:1})]),_:1})]),_:1})]),_:1})]))}});export{S as default};

dist/assets/index-DM4o9yJk.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-DM80WcPK.js
+import{_ as S,$ as g,a0 as M,r as v,a1 as O,a2 as R,a3 as C,u as T,a4 as y,a5 as w,a6 as b,C as _}from"./index-mMdhNzKT.js";function k(e){return R()?(C(e),!0):!1}function m(e){return typeof e=="function"?e():T(e)}const h=typeof window<"u"&&typeof document<"u";typeof WorkerGlobalScope<"u"&&globalThis instanceof WorkerGlobalScope;const W=e=>e!=null,B=()=>{};function D(e){return e||y()}function U(...e){if(e.length!==1)return S(...e);const t=e[0];return typeof t=="function"?g(M(()=>({get:t,set:B}))):v(t)}function $(e,t){D(t)&&O(e,t)}function A(e){var t;const i=m(e);return(t=i==null?void 0:i.$el)!=null?t:i}const E=h?window:void 0,G=h?window.document:void 0;function L(){const e=v(!1),t=y();return t&&_(()=>{e.value=!0},t),e}function q(e){const t=L();return b(()=>(t.value,!!e()))}function x(e,t,i={}){const{window:s=E,...c}=i;let n;const l=q(()=>s&&"MutationObserver"in s),a=()=>{n&&(n.disconnect(),n=void 0)},r=b(()=>{const u=m(e),p=(Array.isArray(u)?u:[u]).map(A).filter(W);return new Set(p)}),d=w(()=>r.value,u=>{a(),l.value&&s&&u.size&&(n=new MutationObserver(t),u.forEach(p=>n.observe(p,c)))},{immediate:!0,flush:"post"}),f=()=>n==null?void 0:n.takeRecords(),o=()=>{a(),d()};return k(o),{isSupported:l,stop:o,takeRecords:f}}function I(e=null,t={}){var i,s,c;const{document:n=G,restoreOnUnmount:l=o=>o}=t,a=(i=n==null?void 0:n.title)!=null?i:"",r=U((s=e??(n==null?void 0:n.title))!=null?s:null),d=e&&typeof e=="function";function f(o){if(!("titleTemplate"in t))return o;const u=t.titleTemplate||"%s";return typeof u=="function"?u(o):m(u).replace(/%s/g,o)}return w(r,(o,u)=>{o!==u&&n&&(n.title=f(typeof o=="string"?o:""))},{immediate:!0}),t.observe&&!t.titleTemplate&&n&&!d&&x((c=n.head)==null?void 0:c.querySelector("title"),()=>{n&&n.title!==r.value&&(r.value=f(n.title))},{childList:!0}),$(()=>{if(l){const o=l(a,r.value||"");o!=null&&n&&(n.title=o)}}),r}export{I as u};
+========
+import{_ as S,$ as g,a0 as M,r as v,a1 as O,a2 as R,a3 as T,u as _,a4 as y,a5 as w,a6 as b,E as k}from"./index-AtzxvIcf.js";function C(e){return R()?(T(e),!0):!1}function m(e){return typeof e=="function"?e():_(e)}const h=typeof window<"u"&&typeof document<"u";typeof WorkerGlobalScope<"u"&&globalThis instanceof WorkerGlobalScope;const W=e=>e!=null,B=()=>{};function D(e){return e||y()}function E(...e){if(e.length!==1)return S(...e);const t=e[0];return typeof t=="function"?g(M(()=>({get:t,set:B}))):v(t)}function U(e,t){D(t)&&O(e,t)}function $(e){var t;const i=m(e);return(t=i==null?void 0:i.$el)!=null?t:i}const A=h?window:void 0,G=h?window.document:void 0;function L(){const e=v(!1),t=y();return t&&k(()=>{e.value=!0},t),e}function q(e){const t=L();return b(()=>(t.value,!!e()))}function x(e,t,i={}){const{window:s=A,...c}=i;let n;const l=q(()=>s&&"MutationObserver"in s),a=()=>{n&&(n.disconnect(),n=void 0)},r=b(()=>{const u=m(e),p=(Array.isArray(u)?u:[u]).map($).filter(W);return new Set(p)}),d=w(()=>r.value,u=>{a(),l.value&&s&&u.size&&(n=new MutationObserver(t),u.forEach(p=>n.observe(p,c)))},{immediate:!0,flush:"post"}),f=()=>n==null?void 0:n.takeRecords(),o=()=>{a(),d()};return C(o),{isSupported:l,stop:o,takeRecords:f}}function I(e=null,t={}){var i,s,c;const{document:n=G,restoreOnUnmount:l=o=>o}=t,a=(i=n==null?void 0:n.title)!=null?i:"",r=E((s=e??(n==null?void 0:n.title))!=null?s:null),d=e&&typeof e=="function";function f(o){if(!("titleTemplate"in t))return o;const u=t.titleTemplate||"%s";return typeof u=="function"?u(o):m(u).replace(/%s/g,o)}return w(r,(o,u)=>{o!==u&&n&&(n.title=f(typeof o=="string"?o:""))},{immediate:!0}),t.observe&&!t.titleTemplate&&n&&!d&&x((c=n.head)==null?void 0:c.querySelector("title"),()=>{n&&n.title!==r.value&&(r.value=f(n.title))},{childList:!0}),U(()=>{if(l){const o=l(a,r.value||"");o!=null&&n&&(n.title=o)}}),r}export{I as u};
+>>>>>>>> edca0c1ac972bccd1dc10d35a40521ab9e132a15:dist/assets/index-DM4o9yJk.js

dist/assets/index-DM80WcPK.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-DM80WcPK.js
 import{_ as S,$ as g,a0 as M,r as v,a1 as O,a2 as R,a3 as C,u as T,a4 as y,a5 as w,a6 as b,C as _}from"./index-mMdhNzKT.js";function k(e){return R()?(C(e),!0):!1}function m(e){return typeof e=="function"?e():T(e)}const h=typeof window<"u"&&typeof document<"u";typeof WorkerGlobalScope<"u"&&globalThis instanceof WorkerGlobalScope;const W=e=>e!=null,B=()=>{};function D(e){return e||y()}function U(...e){if(e.length!==1)return S(...e);const t=e[0];return typeof t=="function"?g(M(()=>({get:t,set:B}))):v(t)}function $(e,t){D(t)&&O(e,t)}function A(e){var t;const i=m(e);return(t=i==null?void 0:i.$el)!=null?t:i}const E=h?window:void 0,G=h?window.document:void 0;function L(){const e=v(!1),t=y();return t&&_(()=>{e.value=!0},t),e}function q(e){const t=L();return b(()=>(t.value,!!e()))}function x(e,t,i={}){const{window:s=E,...c}=i;let n;const l=q(()=>s&&"MutationObserver"in s),a=()=>{n&&(n.disconnect(),n=void 0)},r=b(()=>{const u=m(e),p=(Array.isArray(u)?u:[u]).map(A).filter(W);return new Set(p)}),d=w(()=>r.value,u=>{a(),l.value&&s&&u.size&&(n=new MutationObserver(t),u.forEach(p=>n.observe(p,c)))},{immediate:!0,flush:"post"}),f=()=>n==null?void 0:n.takeRecords(),o=()=>{a(),d()};return k(o),{isSupported:l,stop:o,takeRecords:f}}function I(e=null,t={}){var i,s,c;const{document:n=G,restoreOnUnmount:l=o=>o}=t,a=(i=n==null?void 0:n.title)!=null?i:"",r=U((s=e??(n==null?void 0:n.title))!=null?s:null),d=e&&typeof e=="function";function f(o){if(!("titleTemplate"in t))return o;const u=t.titleTemplate||"%s";return typeof u=="function"?u(o):m(u).replace(/%s/g,o)}return w(r,(o,u)=>{o!==u&&n&&(n.title=f(typeof o=="string"?o:""))},{immediate:!0}),t.observe&&!t.titleTemplate&&n&&!d&&x((c=n.head)==null?void 0:c.querySelector("title"),()=>{n&&n.title!==r.value&&(r.value=f(n.title))},{childList:!0}),$(()=>{if(l){const o=l(a,r.value||"");o!=null&&n&&(n.title=o)}}),r}export{I as u};
+========
+import{_ as S,$ as g,a0 as M,r as v,a1 as O,a2 as R,a3 as T,u as _,a4 as y,a5 as w,a6 as b,E as k}from"./index-AtzxvIcf.js";function C(e){return R()?(T(e),!0):!1}function m(e){return typeof e=="function"?e():_(e)}const h=typeof window<"u"&&typeof document<"u";typeof WorkerGlobalScope<"u"&&globalThis instanceof WorkerGlobalScope;const W=e=>e!=null,B=()=>{};function D(e){return e||y()}function E(...e){if(e.length!==1)return S(...e);const t=e[0];return typeof t=="function"?g(M(()=>({get:t,set:B}))):v(t)}function U(e,t){D(t)&&O(e,t)}function $(e){var t;const i=m(e);return(t=i==null?void 0:i.$el)!=null?t:i}const A=h?window:void 0,G=h?window.document:void 0;function L(){const e=v(!1),t=y();return t&&k(()=>{e.value=!0},t),e}function q(e){const t=L();return b(()=>(t.value,!!e()))}function x(e,t,i={}){const{window:s=A,...c}=i;let n;const l=q(()=>s&&"MutationObserver"in s),a=()=>{n&&(n.disconnect(),n=void 0)},r=b(()=>{const u=m(e),p=(Array.isArray(u)?u:[u]).map($).filter(W);return new Set(p)}),d=w(()=>r.value,u=>{a(),l.value&&s&&u.size&&(n=new MutationObserver(t),u.forEach(p=>n.observe(p,c)))},{immediate:!0,flush:"post"}),f=()=>n==null?void 0:n.takeRecords(),o=()=>{a(),d()};return C(o),{isSupported:l,stop:o,takeRecords:f}}function I(e=null,t={}){var i,s,c;const{document:n=G,restoreOnUnmount:l=o=>o}=t,a=(i=n==null?void 0:n.title)!=null?i:"",r=E((s=e??(n==null?void 0:n.title))!=null?s:null),d=e&&typeof e=="function";function f(o){if(!("titleTemplate"in t))return o;const u=t.titleTemplate||"%s";return typeof u=="function"?u(o):m(u).replace(/%s/g,o)}return w(r,(o,u)=>{o!==u&&n&&(n.title=f(typeof o=="string"?o:""))},{immediate:!0}),t.observe&&!t.titleTemplate&&n&&!d&&x((c=n.head)==null?void 0:c.querySelector("title"),()=>{n&&n.title!==r.value&&(r.value=f(n.title))},{childList:!0}),U(()=>{if(l){const o=l(a,r.value||"");o!=null&&n&&(n.title=o)}}),r}export{I as u};
+>>>>>>>> edca0c1ac972bccd1dc10d35a40521ab9e132a15:dist/assets/index-DM4o9yJk.js

dist/assets/index-W7N1ymtq.js

@@ -0,0 +1 @@
+import{M as l,O as i,Q as c,R as p,b as m,U as d,V as f}from"./index-AtzxvIcf.js";import{s as t,o,n as a}from"./baseUrl-CXJhr-C5.js";let r;const C={title:"",width:"",theme:null,message:"",overlay:!0,callback:null,teleport:"body",className:"",allowHtml:!1,lockScroll:!0,transition:void 0,beforeClose:null,overlayClass:"",overlayStyle:void 0,messageAlign:"",cancelButtonText:"",cancelButtonColor:null,cancelButtonDisabled:!1,confirmButtonText:"",confirmButtonColor:null,confirmButtonDisabled:!1,showConfirmButton:!0,showCancelButton:!1,closeOnPopstate:!0,closeOnClickOverlay:!1};let g=l({},C);function B(){({instance:r}=c({setup(){const{state:s,toggle:n}=p();return()=>m(f,d(s,{"onUpdate:show":n}),null)}}))}function b(e){return i?new Promise((s,n)=>{r||B(),r.open(l({},g,e,{callback:u=>{(u==="confirm"?s:n)(u)}}))}):Promise.resolve(void 0)}const y=e=>b(l({showCancelButton:!0},e)),q=(e,s)=>t.post({url:o+"/admin/consultbidlist",data:e,cancelToken:s}),v=e=>t.post({url:o+"/admin/consultfeadinfo",data:e}),k=e=>t.post({url:o+"/admin/bidscheck",data:e}),S=(e,s)=>t.post({url:a+"/admin/good/list",data:e,cancelToken:s}),O=e=>t.post({url:o+"/admin/goodupinfo",data:e}),x=e=>t.post({url:o+"/admin/goodexam",data:e}),P=e=>t.post({url:a+"user/TaxCategory/listByCompany",data:e}),D=e=>t.post({url:a+"user/supplier/info",data:e}),T=e=>t.post({url:o+"admin/businesssinfo",data:e});export{k as a,P as b,T as c,D as d,S as e,v as f,O as g,x as h,q as r,y as s};

dist/index.html

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!doctype html>
 <html lang="en">
   <head>
@@ -7,6 +8,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <meta name="description" content="Vite Starter Template By Kirk Lin" />
     <script type="module" crossorigin src="/assets/index-mMdhNzKT.js"></script>
+=======
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <meta name="description" content="Vite Starter Template By Kirk Lin" />
+    <script type="module" crossorigin src="/assets/index-AtzxvIcf.js"></script>
+>>>>>>> edca0c1ac972bccd1dc10d35a40521ab9e132a15
     <link rel="stylesheet" crossorigin href="/assets/index-C_jJuFWg.css">
   <link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
   <body>

dist/sw.js

@@ -1 +1,5 @@
+<<<<<<< HEAD
 if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]||new Promise((s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()})).then((()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e})));self.define=(n,l)=>{const r=e||("document"in self?document.currentScript.src:"")||location.href;if(s[r])return;let t={};const o=e=>i(e,r),u={module:{uri:r},exports:t,require:o};s[r]=Promise.all(n.map((e=>u[e]||o(e)))).then((e=>(l(...e),t)))}}define(["./workbox-aca2a06f"],(function(e){"use strict";self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"assets/baseUrl-CN96AegC.js",revision:null},{url:"assets/cost-detail-BpWcNIQS.js",revision:null},{url:"assets/function-call-CWGy-hwk.js",revision:null},{url:"assets/index-C_jJuFWg.css",revision:null},{url:"assets/index-C3Uxjs_q.js",revision:null},{url:"assets/index-CFjWKUqL.js",revision:null},{url:"assets/index-DM80WcPK.js",revision:null},{url:"assets/index-IwKCPuyH.js",revision:null},{url:"assets/index-mMdhNzKT.js",revision:null},{url:"assets/seek-detail-CkBV6eZZ.js",revision:null},{url:"index.html",revision:"42abac73f5cef33d027a524d420e2c7c"},{url:"registerSW.js",revision:"1872c500de691dce40960bb85481de07"},{url:"favicon.ico",revision:"67d34b0decfd4d725d1c1f2eeadc4756"},{url:"pwa-192x192.png",revision:"f388f89cd644482d0cc1609469ca8f74"},{url:"pwa-512x512.png",revision:"7afda480bbadb46f3b0abc6cb0b47b78"},{url:"manifest.webmanifest",revision:"a0cb89bdb09cbab9b830ee23eab86720"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html")))}));
+=======
+if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]||new Promise((s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()})).then((()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e})));self.define=(n,r)=>{const l=e||("document"in self?document.currentScript.src:"")||location.href;if(s[l])return;let t={};const o=e=>i(e,l),u={module:{uri:l},exports:t,require:o};s[l]=Promise.all(n.map((e=>u[e]||o(e)))).then((e=>(r(...e),t)))}}define(["./workbox-aca2a06f"],(function(e){"use strict";self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"assets/baseUrl-CXJhr-C5.js",revision:null},{url:"assets/cost-detail-Dy_GopFH.js",revision:null},{url:"assets/index-AtzxvIcf.js",revision:null},{url:"assets/index-BYV1ATJC.js",revision:null},{url:"assets/index-C_jJuFWg.css",revision:null},{url:"assets/index-DCNyBVR6.js",revision:null},{url:"assets/index-DM4o9yJk.js",revision:null},{url:"assets/index-W7N1ymtq.js",revision:null},{url:"assets/seek-detail-la1YSXLa.js",revision:null},{url:"index.html",revision:"96e218fa849e0fa543fe6b5f8c7f3f55"},{url:"registerSW.js",revision:"1872c500de691dce40960bb85481de07"},{url:"favicon.ico",revision:"67d34b0decfd4d725d1c1f2eeadc4756"},{url:"pwa-192x192.png",revision:"f388f89cd644482d0cc1609469ca8f74"},{url:"pwa-512x512.png",revision:"7afda480bbadb46f3b0abc6cb0b47b78"},{url:"manifest.webmanifest",revision:"a0cb89bdb09cbab9b830ee23eab86720"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html")))}));
+>>>>>>> edca0c1ac972bccd1dc10d35a40521ab9e132a15

src/pages/home/components/cost-product.vue

@@ -157,7 +157,7 @@ function handleTabChange(){
                     border: 1px solid #dcdfe6;
                     overflow:hidden
                   " 
-                  @click="showImagePreview([item.good_info_img])"
+                  @click="showImagePreview({ images: [item.good_info_img], closeable: true })"
                   :src="item.good_info_img"
                 />
                 <p class="font-[16px] font-700 py-[5px]">{{ item.good_name }}</p>

src/pages/home/components/seek-product.vue

@@ -307,7 +307,7 @@ const isApproval = (item) => item.tax_status == '0'
                     border: 1px solid #dcdfe6;
                     overflow:hidden
                   " 
-                  @click="showImagePreview([item.good_img])"
+                  @click="showImagePreview({ images:[item.good_img], closeable: true  })"
                   :src="item.good_img"
                 />
                 <p class="font-[16px] font-700 py-[5px]">{{ item.good_name }}</p>