Procházet zdrojové kódy

实现由dict.php 里 hasMap 来控制地址选择功能而做的小修改

shizhongqi před 11 měsíci
rodič
revize
aa7fee0e4c

+ 2 - 0
app-ghs/controllers/ShopController.php

@@ -442,6 +442,8 @@ class ShopController extends BaseController
             //这个注释不能打开,因为首店可能修改其它分店信息
             //util::fail('无法查看');
         }
+        $shop = $shop->toArray();
+        $shop['hasMap'] = dict::getDict('hasMap'); //添加 hasMap 属性(字典中的 hasMap)
         util::success(['info' => $shop]);
     }
 

+ 6 - 0
app-mall/controllers/ExpressController.php

@@ -3,6 +3,7 @@
 namespace mall\controllers;
 
 use bizMall\order\classes\OrderClass;
+use common\components\dict;
 use Yii;
 use common\components\util;
 
@@ -33,4 +34,9 @@ class ExpressController extends BaseController
         util::success(['distance' => $distance, 'showDistance' => $showDistance, 'fee' => $fee]);
     }
 
+    // 获取字典中的 hasMap
+    public function actionGetHasMap()
+    {
+        util::success(['hasMap' => dict::getDict('hasMap')]);
+    }
 }

+ 2 - 2
app-mall/controllers/OrderController.php

@@ -294,8 +294,8 @@ class OrderController extends BaseController
             if ($sendType == dict::getDict('sendType', 'thirdSend')) {
                 $lat = $post['lat'] ?? '';
                 $lng = $post['long'] ?? '';
-                if (empty($lat) || empty($lng)) {
-                    util::fail('请填写收花地址哦');
+                if ((empty($lat) || empty($lng)) && dict::getDict('hasMap')==1) { // 当 hasMap 为1时,经纬数据是必要的
+                    util::fail('缺少经纬数据');
                 }
                 $address = $post['address'] ?? '';
                 $floor = $post['floor'] ?? '';

+ 0 - 17
common/components/wxapi/WxApi.php

@@ -1,19 +1,14 @@
 <?php
-
 /**
  * 封装微信api签名安全类
  */
-
 namespace common\components\wxapi;
 
-
 use phpseclib\Crypt\RSA;
-use Yii;
 use yii\base\ErrorException;
 
 class WxApi
 {
-
     private $appId;
     private $aes;
     private $rsa;
@@ -50,7 +45,6 @@ class WxApi
      */
     public function request($url, $reqData)
     {
-//        $accessToken = '';
         $this->url = $url;
         $urls = $url . "?access_token=" . $this->accessToken;
         //1.数据加密
@@ -89,17 +83,6 @@ class WxApi
         return $this->jM($headers['Wechatmp-TimeStamp'], $body);
     }
 
-    /**
-     * Name:获取accessToken
-     * User: zcw
-     * Date: 2023/7/14
-     * Time: 9:15
-     */
-//    public function getAccessToken()
-//    {
-//        $qr = new MiniHelper();
-//        return $qr->getAccessToken();
-//    }
 
     /**
      * Name:post请求