合并分支 'juan' 到 'master'

修改地址



查看合并请求 !113

-<?php
+<?php
 /**
  * Created by PhpStorm.
  * User: wz
@@ -162,8 +162,9 @@ class ZjCartController extends HomeBaseController
                     }
                 }
             }
-            require_once EXTEND_PATH . '/WeChatCommon.php';
-            $wx = new \WeChatCommon();
+
+            //require_once EXTEND_PATH . '/WeChatCommon.php';
+            //$wx = new \WeChatCommon();
             return $this->fetch('order_confirm', [
                 'data' => $data,
                 'address' => $address,
@@ -180,4 +181,4 @@ class ZjCartController extends HomeBaseController
         }
     }
 
-}
\ No newline at end of file
+}

@@ -6,6 +6,9 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <link rel="stylesheet" href="https://at.alicdn.com/t/font_834805_0ml90wdq5hzm.css">
     <link rel="stylesheet" href="https://at.alicdn.com/t/font_834805_bx3vyrf79mj.css">
+    <link rel="stylesheet" href="__INDEX__/css/weui.css">
+    <link rel="stylesheet" href="__INDEX__/css/jquery-weui.css">
+    <link rel="stylesheet" href="__INDEX__/css/demos.css">
     <link rel="stylesheet" href="__INDEX__/css/base.css">
     <link rel="stylesheet" href="__INDEX__/css/order.css">
     <link rel="stylesheet" href="__INDEX__/css/swiper.min.css">