二维码添加字段 文件过滤

.gitignore

@@ -0,0 +1,14 @@
+# uniapp
+/unpackage
+.vite
+
+# Node.js
+/node_modules
+
+.idea
+
+dist
+
+.hbuilderx
+
+*.zip

.vite/deps/_metadata.json

@@ -1,11 +1,11 @@
 {
-  "hash": "a9263dce",
-  "browserHash": "10211634",
+  "hash": "89538b96",
+  "browserHash": "1d71e8d1",
   "optimized": {
     "html2canvas": {
       "src": "../../node_modules/html2canvas/dist/html2canvas.esm.js",
       "file": "html2canvas.js",
-      "fileHash": "f80eb13e",
+      "fileHash": "93c29dc9",
       "needsInterop": false
     }
   },

.vite/deps/html2canvas.js

@@ -1,4 +1,4 @@
-// ../../../zhaogongxue/banma/node_modules/html2canvas/dist/html2canvas.esm.js
+// ../../../../project/banma/node_modules/html2canvas/dist/html2canvas.esm.js
 var extendStatics = function(d, b) {
   extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
     d2.__proto__ = b2;

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "banma",
-    "appid" : "__UNI__6CFFF0C",
+    "appid" : "__UNI__658B74D",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/deal/deal.vue

@@ -497,7 +497,7 @@
 			return
 		}
 		uni.navigateTo({
-			url:'/pages/deal/productInfo?id='+item.id
+			url:`/pages/deal/productInfo?id=${item.id}`+(item.rand_num?`&rand_num=${item.rand_num}`:'')
 			// url:'/pages/deal/productInfo?id='+6
 		})
 	}

pages/deal/productInfo.vue

@@ -141,7 +141,7 @@
 		<view class="swiper-item swiper-itemcopy" id="copyswiperItem">
 			<view class="titleBox" :style="{background: 'url('+BASE_URL+jt_bg1+')'}">
 				<!-- <image :src="BASE_URL+item.qrimage" mode=""></image> -->
-				<limeQrcodeVue ref="qrcodeRef" :value="BASE_URL1+'/h5/#/pages/deal/productInfo?id='+id" size="112rpx" ></limeQrcodeVue>
+				<limeQrcodeVue ref="qrcodeRef" :value="BASE_URL1+`/h5/#/pages/deal/productInfo?id=${id}`+(rand_num?`&rand_num=${rand_num}`:'')" size="112rpx" ></limeQrcodeVue>
 				<view class="title">
 					<p>{{item.title1}}</p>
 			
@@ -164,7 +164,7 @@
 				:style="{left:item.watermark_info.waterPos==0?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==1?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==4?0+item.watermark_info.voffset+'px':item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==2?'calc( 40%'+' + '+item.watermark_info.xx+'px )':item.watermark_info.waterPos==5?'calc( 40%'+' + '+item.watermark_info.voffset+'px )':item.watermark_info.waterPos==8?'calc( 40%'+' + '+item.watermark_info.xx+'px )':'',top:item.watermark_info.waterPos==0?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==1?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==2?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==3?0+item.watermark_info.yy+'px':item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==6?0+item.watermark_info.waterPos+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':'',bottom:item.watermark_info.waterPos==7?0+item.watermark_info.xx+'px':item.watermark_info.waterPos==8?0+item.watermark_info.ww+'px':item.watermark_info.waterPos==9?0+item.watermark_info.xx+'px':'',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}"
 				v-if="item.watermark_info&&item.watermark_info.type==2||item.watermark_info&&item.watermark_info.type==4">
 					
-					<view  class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,fontSize:item.watermark_info.text_font+'px'}">
+					<view  class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',color:`rgba(${hexToRgb(item.watermark_info.color).rgb},${(100-item.watermark_info.opacity*1)*0.01})`,fontSize:item.watermark_info.text_font+'px'}">
 						<image  :src="BASE_URL+item.watermark_info.image" mode="" v-if="item.watermark_info.image&&item.watermark_info.type==2"></image>
 						<text v-if="item.watermark_info.water_text&&item.watermark_info.type==4">{{item.watermark_info.water_text}}</text>
 					</view>
@@ -196,7 +196,7 @@
 				</view>
 				<view class="watermark1" :style="{left:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==4?0:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==2?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==8?'40%':'',top:item.watermark_info.waterPos==0?0:item.watermark_info.waterPos==1?0:item.watermark_info.waterPos==2?0:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==4?'40%':item.watermark_info.waterPos==5?'40%':item.watermark_info.waterPos==6?'40%':'',right:item.watermark_info.waterPos==3?0:item.watermark_info.waterPos==6?0:item.watermark_info.waterPos==9?0:'',bottom:item.watermark_info.waterPos==7?0:item.watermark_info.waterPos==8?0:item.watermark_info.waterPos==9?0:'',fontWeight:item.watermark_info.bold==1?'bold':'',fontFamily:item.watermark_info.typeface==1?'typeface1':item.watermark_info.typeface==2?'typeface2':item.watermark_info.typeface==3?'typeface3':item.watermark_info.typeface==4?'typeface4':item.watermark_info.typeface==5?'typeface5':item.watermark_info.typeface==6?'typeface6':''}"  v-if="item.watermark_info&&item.watermark_info.type==2||item.watermark_info&&item.watermark_info.type==4">
 					
-					<view  class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',opacity:(100-item.watermark_info.opacity*1)*0.01,color:item.watermark_info.color,fontSize:item.watermark_info.text_font+'px'}">
+					<view  class="" :style="{transform: 'rotate('+item.watermark_info.angle+'deg)',color:`rgba(${hexToRgb(item.watermark_info.color).rgb},${(100-item.watermark_info.opacity*1)*0.01})`,fontSize:item.watermark_info.text_font+'px'}">
 						<image  :src="BASE_URL+item.watermark_info.image" mode="" v-if="item.watermark_info.image&&item.watermark_info.type==2"></image>
 						<text v-if="item.watermark_info.water_text&&item.watermark_info.type==4">{{item.watermark_info.water_text}}</text>
 					</view>
@@ -305,10 +305,11 @@
 			kefu.value=res.data.kfwx
 			kefu.value=res.data.kfwx
 		})
-id.value=option.id
+id.value=option.id;
+rand_num.value=option.rand_num;
 let images_arr=[]
 let index = new Date().getTime()
-getGoodsDetail(id.value).then(res=>{
+getGoodsDetail({goods_id:id.value,rand_num:rand_num.value}).then(res=>{
 	
 	if(res.code==1){
 		bg_list.value=res.data.bg_list
@@ -394,6 +395,7 @@ getGoodsDetail(id.value).then(res=>{
 	let item=ref({})
 	let info=ref({})
 	let id=ref('')
+	let rand_num=ref('')
 	let showPopup = ref(false)
 	let swiperHeight =ref(67)
 	let goBack = () => {
@@ -571,6 +573,35 @@ getGoodsDetail(id.value).then(res=>{
 		});
 		return attributes;
 	}
+
+	function hexToRgb (val) {   //HEX十六进制颜色值转换为RGB(A)颜色值
+                // 16进制颜色值的正则
+                var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+                // 把颜色值变成小写
+                var color = val.toLowerCase();
+                var result = '';
+                if (reg.test(color)) {
+                    // 如果只有三位的值，需变成六位，如：#fff => #ffffff
+                    if (color.length === 4) {
+                        var colorNew = "#";
+                        for (var i = 1; i < 4; i += 1) {
+                            colorNew += color.slice(i, i + 1).concat(color.slice(i, i + 1));
+                        }
+                        color = colorNew;
+                    }
+                    // 处理六位的颜色值，转为RGB
+                    var colorChange = [];
+                    for (var i = 1; i < 7; i += 2) {
+                        colorChange.push(parseInt("0x" + color.slice(i, i + 2)));
+                    }
+                    result =  colorChange.join(",") 
+                    return { rgb: result, r: colorChange[0], g: colorChange[1], b: colorChange[2] };
+                } else {
+                    result = '无效';
+                    return { rgb: result };
+                }
+ 
+            }
 </script>
 
 

pages/index/index.vue

@@ -10,7 +10,7 @@
 					<view class="swiper-item swiper-itemcopy" :id='"copyswiperItem"+index'>
 						<view class="titleBox" :style="{background: 'url('+BASE_URL+jt_bg1+')'}">
 							<!-- <image :src="BASE_URL+item.qrimage" mode=""></image> -->
-							<limeQrcodeVue ref="qrcodeRef" :value="BASE_URL1+'/h5/#/pages/deal/productInfo?id='+item.id" size="112rpx" ></limeQrcodeVue>
+							<limeQrcodeVue ref="qrcodeRef" :value="BASE_URL1+`/h5/#/pages/deal/productInfo?id=${item.id}&rand_num=${item.rand_num}`" size="112rpx" ></limeQrcodeVue>
 							<view class="title">
 								<p>{{item.title1}}</p>
 								<p>{{item.title2}}</p>
@@ -51,8 +51,7 @@
 						<view class="titleBox" :style="{background: 'url('+BASE_URL+jt_bg1+')'}">
 						<!-- <view class="titleBox"> -->
 							<!-- <image :src="BASE_URL+item.qrimage" mode=""></image> -->
-							<limeQrcodeVue ref="qrcodeRef" :value="BASE_URL1+'/h5/#/pages/deal/productInfo?id='+item.id"
-								size="112rpx"></limeQrcodeVue>
+							<limeQrcodeVue ref="qrcodeRef" :value="BASE_URL1+`/h5/#/pages/deal/productInfo?id=${item.id}&rand_num=${item.rand_num}`" size="112rpx" ></limeQrcodeVue>
 							<view class="title">
 								<p>{{item.title1}}</p>
 

unpackage/dist/build/h5/assets/html2canvas-3516559c.css

@@ -1 +0,0 @@
-.l-qrcode[data-v-ae04069d]{position:relative}.l-qrcode-mask[data-v-ae04069d]{position:absolute;inset:0;z-index:10;display:flex;flex-direction:column;justify-content:center;align-items:center;color:rgba(0,0,0,.88);line-height:1.5714285714;background:rgba(255,255,255,.96);text-align:center}

unpackage/dist/build/h5/assets/pages-notice-notice.f5b41081.js

@@ -1 +0,0 @@
-import{r as t,g as a,s as e,a as s,L as o,e as l,o as n,f as u,w as r,i as c,h as i,n as _,u as f,j as d,A as m,x as p}from"./index-8f185d2b.js";import{_ as v}from"./u-notice-bar.ee3f2e0f.js";import{_ as y,o as b,a as j,b as x,r as C}from"./u-icon.098e319a.js";import{_ as g}from"./u-parse.d965ba50.js";/* empty css                                                                   */const k=y({__name:"notice",setup(y){let k=t(""),A=t("");b((()=>{a().then((t=>{e({title:t.data.name})})),s().then((t=>{k.value=t.data.platform_information,A.value=t.data.platform_rules})),h.value=o().globalData.config.infomation_notice})),j((()=>{}));let h=t(""),F=t(1),I=t=>{F.value!=t&&(F.value=t)};return x((()=>{setTimeout((function(){l()}),1e3)})),(t,a)=>{const e=m,s=c,o=C(p("u-notice-bar"),v),l=C(p("u-parse"),g);return n(),u(s,{class:""},{default:r((()=>[i(s,{class:"sort"},{default:r((()=>[i(s,{class:"sortItem",style:_({color:1==f(F)?"#A5CF49":"#333333"}),onClick:a[0]||(a[0]=t=>f(I)(1))},{default:r((()=>[i(e,null,{default:r((()=>[d("平台资讯")])),_:1})])),_:1},8,["style"]),i(s,{class:"sortItem",onClick:a[1]||(a[1]=t=>f(I)(2)),style:_({color:2==f(F)?"#A5CF49":"#333333"})},{default:r((()=>[i(e,null,{default:r((()=>[d("平台规则")])),_:1})])),_:1},8,["style"])])),_:1}),i(s,{class:"notice"},{default:r((()=>[i(o,{text:f(h),color:"#fff",bgColor:"#A5CF49",fontSize:"16"},null,8,["text"])])),_:1}),i(s,{class:"content"},{default:r((()=>[1==f(F)?(n(),u(l,{key:0,content:f(k)},null,8,["content"])):(n(),u(l,{key:1,content:f(A)},null,8,["content"]))])),_:1})])),_:1})}}},[["__scopeId","data-v-7808cb32"]]);export{k as default};

unpackage/dist/build/h5/assets/pages-skip-skip.9baf2435.js

@@ -1 +0,0 @@
-import{r as a,g as t,s as e,e as s,o,f as u,w as l,i as n,u as r,h as c,z as i,x as f,W as m}from"./index-8f185d2b.js";import{_ as p}from"./u-notice-bar.ee3f2e0f.js";import{_,o as d,a as j,b,r as v}from"./u-icon.098e319a.js";import{_ as x}from"./u-parse.d965ba50.js";const k=_({__name:"skip",setup(_){let k=a(""),y=a();d((()=>{t().then((a=>{e({title:a.data.name});let t=a.data;1==t.jtype?(y.value=1,g.value=t.jump_url):(y.value=2,g.value=t.jump_text,k.value=t.jump_notice)}))}));let g=a("");return j((()=>{})),b((()=>{setTimeout((function(){s()}),1e3)})),(a,t)=>{const e=v(f("u-notice-bar"),p),s=n,_=m,d=v(f("u-parse"),x);return o(),u(s,{class:""},{default:l((()=>[2==r(y)?(o(),u(s,{key:0,class:"notice"},{default:l((()=>[c(e,{text:r(k),color:"#fff",bgColor:"#A5CF49",fontSize:"16"},null,8,["text"])])),_:1})):i("",!0),1==r(y)?(o(),u(_,{key:1,src:r(g)},null,8,["src"])):i("",!0),2==r(y)?(o(),u(s,{key:2,class:"content"},{default:l((()=>[c(d,{content:r(g)},null,8,["content"])])),_:1})):i("",!0)])),_:1})}}},[["__scopeId","data-v-62b993bb"]]);export{k as default};

unpackage/dist/build/h5/assets/skip-53a3464d.css

@@ -1 +0,0 @@
-.content[data-v-62b993bb]{padding:0 .625rem}

unpackage/dist/build/h5/assets/u-icon-d34a0ef2.css

@@ -1 +0,0 @@
-uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}

unpackage/dist/build/h5/assets/u-notice-bar-446ba290.css

@@ -1 +0,0 @@
-uni-view[data-v-4c1f2f4b],uni-scroll-view[data-v-4c1f2f4b],uni-swiper-item[data-v-4c1f2f4b]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-notice[data-v-4c1f2f4b]{display:flex;flex-direction:row;align-items:center;justify-content:space-between}.u-notice__left-icon[data-v-4c1f2f4b]{align-items:center;margin-right:5px}.u-notice__right-icon[data-v-4c1f2f4b]{margin-left:5px;align-items:center}.u-notice__swiper[data-v-4c1f2f4b]{height:16px;display:flex;flex-direction:row;align-items:center;flex:1}.u-notice__swiper__item[data-v-4c1f2f4b]{display:flex;flex-direction:row;align-items:center;overflow:hidden}.u-notice__swiper__item__text[data-v-4c1f2f4b]{font-size:14px;color:#f9ae3d}uni-view[data-v-385a1828],uni-scroll-view[data-v-385a1828],uni-swiper-item[data-v-385a1828]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-notice[data-v-385a1828]{display:flex;flex-direction:row;align-items:center;justify-content:space-between}.u-notice__left-icon[data-v-385a1828]{align-items:center;margin-right:5px}.u-notice__right-icon[data-v-385a1828]{margin-left:5px;align-items:center}.u-notice__content[data-v-385a1828]{text-align:right;flex:1;display:flex;flex-direction:row;flex-wrap:nowrap;overflow:hidden}.u-notice__content__text[data-v-385a1828]{font-size:14px;color:#f9ae3d;padding-left:100%;word-break:keep-all;white-space:nowrap;animation:u-loop-animation-385a1828 10s linear infinite both;display:flex;flex-direction:row}@keyframes u-loop-animation-385a1828{0%{transform:translateZ(0)}to{transform:translate3d(-100%,0,0)}}uni-view[data-v-abff91ff],uni-scroll-view[data-v-abff91ff],uni-swiper-item[data-v-abff91ff]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-notice-bar[data-v-abff91ff]{overflow:hidden;padding:9px 12px;flex:1}

unpackage/dist/build/h5/assets/zb-tooltip-eb7ef32d.css

@@ -1 +0,0 @@
-.zb-tooltip[data-v-7dd658dc]{position:absolute;transform:translate(0);animation:example1-7dd658dc 1s linear 0s backwards;animation-iteration-count:infinite}@keyframes example1-7dd658dc{0%{transform:translateY(20px)}25%{transform:translateY(10px)}50%{transform:translateY(0)}75%{transform:translateY(10px)}to{transform:translateY(20px)}}.zb_tooltip_content[data-v-7dd658dc]{position:relative;display:inline-block}.zb_tooltip__popper[data-v-7dd658dc]{background:var(--theme-bg-color);visibility:hidden;position:absolute;border-radius:4px;font-size:12px;padding:0 10px;min-width:10px;word-wrap:break-word;display:inline-block;white-space:nowrap;z-index:9}.zb_popper__icon[data-v-7dd658dc]{width:0;height:0;z-index:9;position:absolute}.zb_popper__arrow[data-v-7dd658dc]{bottom:-5px;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid var(--theme-bg-color)}.zb_popper__right[data-v-7dd658dc]{border-top:6px solid transparent;border-bottom:6px solid transparent;border-right:6px solid var(--theme-bg-color);left:-5px}.zb_popper__left[data-v-7dd658dc]{border-top:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid var(--theme-bg-color);right:-5px}.zb_popper__up[data-v-7dd658dc]{border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid var(--theme-bg-color);top:-5px}.fixed[data-v-7dd658dc]{position:absolute;width:100vw;height:100vh;position:fixed;left:0;top:0;pointer-events:auto;background:red;z-index:-1}

unpackage/dist/build/h5/index.html

@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <link rel="stylesheet" href="/h5/assets/uni.7f8ed3d3.css">
-
-    <meta charset="UTF-8" />
-	<!-- // 仅有IE浏览器才识别的标签，不一定会在请求字段加上Pragma，但的确会让当前页面每次都发新请求 -->
-	<meta http-equiv="pragma" content="no-cache">
-	<!-- // 其他主流浏览器识别的标签 -->
-	<meta http-equiv="cache-control" content="no-cache">
-	<!-- // 仅有IE浏览器才识别的标签，该方式仅仅作为知会IE缓存时间的标记，你并不能在请求或响应报文中找到Expires字段 -->
-	<meta http-equiv="expires" content="0">
-
-
-    <script>
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-	<!-- <script src="./common/html2canvas.min.js"></script> -->
-	 <script src="/common/jquery-3.6.1.js"></script>
-
-    <title>banma</title>
-    <!--preload-links-->
-    <!--app-context-->
-    <script type="module" crossorigin src="/h5/assets/index-8f185d2b.js"></script>
-    <link rel="stylesheet" href="/h5/assets/index-8dee9acb.css">
-  </head>
-  <body>
-    <div id="app"><!--app-html--></div>
-    
-  </body>
-</html>

unpackage/dist/build/h5/uni_modules/lime-qrcode/hybrid/html/index.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>lime-qrcode</title>
-	<style>
-		html,body,canvas {
-			margin: 0;
-			padding: 0;
-			width: 100%;
-			height: 100%;
-			pointer-events: none;
-			/* background-color: rgba(255,0,0,0.1) */
-		}
-	</style>
-</head>
-<body>
-	<canvas id="lime-qrcode"></canvas>
-	<script type="text/javascript" src="./uni.webview.1.5.3.js"></script>
-	<script type="text/javascript" src="./qrcode.min.js"></script>
-	<script>
-		var canvas = document.querySelector('#lime-qrcode')
-		var pixelRatio = window.devicePixelRatio || 1
-		function appendWatermark(image) {
-			emit('append', mark.toDataURL())
-		}
-		
-		var qrcode = new lime.QRCodeCanvas(canvas, {
-			pixelRatio,
-		})
-		function render(props) {
-			if(props.pixelRatio) {
-				pixelRatio = props.pixelRatio
-			}
-			if(qrcode) {
-				qrcode.render(props)
-			} 
-		}
-		function toDataURL(file) {
-			if(qrcode && canvas) {
-				try{
-					const image = canvas.toDataURL()
-					emit('toDataURL', {
-						file,
-						image
-					})
-				}catch(e){
-					emit('toDataURL', {
-						file,
-						msg: e
-					})
-				}
-				
-			} 
-		}
-		function emit(event, data) {
-			postMessage({
-				event,
-				data
-			});
-		};
-		function postMessage(data) {
-			uni.postMessage({
-				data
-			});
-		};
-		// render({
-		// 	content: ['Lime UI'],
-		// 	// rotate: -22,
-		// 	// baseSize: 2,
-		// 	// fontGap: 3
-		// })
-	</script>
-</body>
-</html>

utils/api.js

@@ -62,13 +62,11 @@ export function getGoodsList(options){
 	    })
 }
 // 获取商品详情
-export function getGoodsDetail(id){
+export function getGoodsDetail(data){
 	return request({
 	        url: "/api/index/getGoodsDetail",
 	        method: 'GET',
-	        data:{
-				goods_id:id
-			}
+	        data
 	    })
 }
 // 获取商品搜索标签