gcz %!s(int64=4) %!d(string=hai) anos
pai
achega
206b444793

+ 1 - 1
pages/confirmorder/confirmorder.vue

@@ -124,7 +124,7 @@
 						orderId:orderId,
 						payType:payType,
 						openid:userInfo.wxUsers.openid,
-						"tradeType":"test"
+						// "tradeType":"test"
 					}
 					this.$pay.wxPay(params).then(res =>{
 						console.log('payres',res);

+ 1 - 1
pages/usercenter/myorder/myorder.vue

@@ -250,7 +250,7 @@
 						orderId:item.id,
 						payType:item.payType,
 						openid:userInfo.wxUsers.openid,
-						"tradeType":"test"
+						// "tradeType":"test"
 					}
 					this.$pay.wxPay(params).then(res =>{
 						this.downCallback();

+ 1 - 1
pages/usercenter/myorder/orderdetails/orderdetails.vue

@@ -230,7 +230,7 @@
 						orderId:this.item.id,
 						payType:this.item.payType,
 						openid:userInfo.wxUsers.openid,
-						"tradeType":"test"
+						// "tradeType":"test"
 					}
 					this.$pay.wxPay(params).then(res =>{
 						this.getdetails();

+ 1 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>贵州林产品信息发布平台</title><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><link rel=stylesheet href=./static/index.58d5e7ce.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.6944f8e3.js></script><script src=./static/js/index.584f101d.js></script></body></html>
+            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><link rel=stylesheet href=./static/index.1e555237.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.d38c5624.js></script><script src=./static/js/index.1f6b2916.js></script></body></html>

BIN=BIN
unpackage/dist/build/h5/static/fonts/iconfont.27bffce2.woff


BIN=BIN
unpackage/dist/build/h5/static/fonts/iconfont.3aceb4b3.eot


BIN=BIN
unpackage/dist/build/h5/static/fonts/iconfont.c736bf9a.ttf


+ 161 - 0
unpackage/dist/build/h5/static/iconfont/demo_index.html

@@ -30,6 +30,48 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe63d;</span>
+                <div class="name">后退</div>
+                <div class="code-name">&amp;#xe63d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe662;</span>
+                <div class="name">加</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe663;</span>
+                <div class="name">减</div>
+                <div class="code-name">&amp;#xe663;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65f;</span>
+                <div class="name">地质</div>
+                <div class="code-name">&amp;#xe65f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe660;</span>
+                <div class="name">风云榜</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe661;</span>
+                <div class="name">更多</div>
+                <div class="code-name">&amp;#xe661;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65e;</span>
+                <div class="name">保(3)</div>
+                <div class="code-name">&amp;#xe65e;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe65d;</span>
                 <div class="name">企业认证</div>
@@ -182,6 +224,69 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont iconhoutui"></span>
+            <div class="name">
+              后退
+            </div>
+            <div class="code-name">.iconhoutui
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconjia"></span>
+            <div class="name">
+              加
+            </div>
+            <div class="code-name">.iconjia
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconjian"></span>
+            <div class="name">
+              减
+            </div>
+            <div class="code-name">.iconjian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icondizhi1"></span>
+            <div class="name">
+              地质
+            </div>
+            <div class="code-name">.icondizhi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconfengyunbang"></span>
+            <div class="name">
+              风云榜
+            </div>
+            <div class="code-name">.iconfengyunbang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icongengduo"></span>
+            <div class="name">
+              更多
+            </div>
+            <div class="code-name">.icongengduo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconbao3"></span>
+            <div class="name">
+              保(3)
+            </div>
+            <div class="code-name">.iconbao3
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont iconwodetuandui"></span>
             <div class="name">
@@ -364,6 +469,62 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconhoutui"></use>
+                </svg>
+                <div class="name">后退</div>
+                <div class="code-name">#iconhoutui</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconjia"></use>
+                </svg>
+                <div class="name">加</div>
+                <div class="code-name">#iconjia</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconjian"></use>
+                </svg>
+                <div class="name">减</div>
+                <div class="code-name">#iconjian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icondizhi1"></use>
+                </svg>
+                <div class="name">地质</div>
+                <div class="code-name">#icondizhi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconfengyunbang"></use>
+                </svg>
+                <div class="name">风云榜</div>
+                <div class="code-name">#iconfengyunbang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icongengduo"></use>
+                </svg>
+                <div class="name">更多</div>
+                <div class="code-name">#icongengduo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconbao3"></use>
+                </svg>
+                <div class="name">保(3)</div>
+                <div class="code-name">#iconbao3</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#iconwodetuandui"></use>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
unpackage/dist/build/h5/static/iconfont/iconfont.css


BIN=BIN
unpackage/dist/build/h5/static/iconfont/iconfont.eot


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/h5/static/iconfont/iconfont.js


+ 49 - 0
unpackage/dist/build/h5/static/iconfont/iconfont.json

@@ -5,6 +5,55 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "16162443",
+      "name": "后退",
+      "font_class": "houtui",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "18205013",
+      "name": "加",
+      "font_class": "jia",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "18205014",
+      "name": "减",
+      "font_class": "jian",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "18205009",
+      "name": "地质",
+      "font_class": "dizhi1",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "18205010",
+      "name": "风云榜",
+      "font_class": "fengyunbang",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "18205011",
+      "name": "更多",
+      "font_class": "gengduo",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "16978183",
+      "name": "保(3)",
+      "font_class": "bao3",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
     {
       "icon_id": "16956711",
       "name": "企业认证",

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 15 - 0
unpackage/dist/build/h5/static/iconfont/iconfont.svg


BIN=BIN
unpackage/dist/build/h5/static/iconfont/iconfont.ttf


BIN=BIN
unpackage/dist/build/h5/static/iconfont/iconfont.woff


BIN=BIN
unpackage/dist/build/h5/static/iconfont/iconfont.woff2


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 22
unpackage/dist/build/h5/static/img/iconfont.3e5f1609.svg


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio