fix conflicts

app-hd/controllers/MainController.php

@@ -97,7 +97,7 @@ class MainController extends BaseController
         }
 
         $merchant = WxOpenClass::getMallWxInfo();
-        $goodsPage = 'pages/home/index';
+        $goodsPage = 'pages/home/index?account=' . $shopId;
         $ptStyle = dict::getDict('ptStyle', 'mall');
         $scene = 'a=' . $adminId . '&s=' . $shopId;
         $goodsImgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $goodsPage, $scene, $ptStyle, $envVersion);