Merge branch 'dev'

README.md

@@ -47,3 +47,38 @@ npm run build:mp-weixin
 ### [蓝湖](https://lanhuapp.com/web/#/item/project/board?pid=9ab56cc5-0b3b-4a9c-8cd0-0cf57751010a)   
 
 *分包情况下，H5无法编译image的绝对路径，相对路径正常*
+
+### 20210820 鉴权接口更改
+
+```
+
+    a -> 加 /admin
+    n -> 没找到
+    y -> 原本就有
+
+    /stadium/list       a
+    /stadium/detail/    a
+    /stadium/edit/      n
+    客服设置
+    /brand/customerService/add  n
+    /brand/customerService/del  n
+    /brand/customerService/edit n
+    /stadium/comment/reply  n
+    /stadium/brand/list     n
+    /stadium/brand/add      n
+    /stadium/brand/edit     n
+    /stadium/brand/del      n
+    /stadium/list           y
+    /stadium/add            n
+    /stadium/detail         y
+    /stadium/edit           n
+    /stadium/del            n
+    /stadium/addVenue       n
+    /stadium/editVenue      n
+    /stadium/getVenue       n
+    /brand/message/list     a
+    /brand/message/del      n
+    /brand/message/add      n
+    /brand/message/edit     n
+
+```

src/components/site/order_modal/order_modal.vue

@@ -112,7 +112,6 @@
 			</view>
 		</view>
 	</view>
-    
 </template>
 
 <script>

src/js/api.js

@@ -7,8 +7,8 @@ export const API = {
   brandInfo: `${ORIGIN}/stadium/brand/get`,  //  品牌信息
   assistantAuth: `${ORIGIN}/assistant/auth`,  //  授权绑定 - 获取用户信息
   calc: `${ORIGIN}/admin/assistant/calc`,  //  首页 统计页面
-  stadiumList: `${ORIGIN}/stadium/list`,  //  店铺列表
-  stadiumDetail: `${ORIGIN}/stadium/detail`,  // A店铺管理-店铺列表-店铺详情
+  stadiumList: `${ORIGIN}/admin/stadium/list`,  //  店铺列表
+  stadiumDetail: `${ORIGIN}/admin/stadium/detail`,  // A店铺管理-店铺列表-店铺详情
 
   verifiedOrderList: `${ORIGIN}/admin/assistant/order/verified`,  // 核销订单列表
   verifiedOrderInfo: `${ORIGIN}/admin/stadium/order/get`,  // 核销订单信息
@@ -41,7 +41,7 @@ export const API = {
 
 
   // 消息列表
-  messageList:`${ORIGIN}/brand/message/list`,  // 系统消息列表
+  messageList:`${ORIGIN}/admin/brand/message/list`,  // 系统消息列表
   messageRead:`${ORIGIN}/brand/message/read`,  // 查看系统消息
 
 }

src/subpackage/device/js/device_api.js

@@ -2,7 +2,7 @@ import { ORIGIN } from '../../../js/api';
 
 export const DEVICE_API = { 
 	ORIGIN:ORIGIN,
-    stadiumList:`${ORIGIN}/stadium/list`,  //  店铺列表
+    stadiumList:`${ORIGIN}/admin/stadium/list`,  //  店铺列表
     vendingGoodsList:`${ORIGIN}/stadium/vending/goods/list`,  //  售货柜-商品列表
     vendingGoodsRestock:`${ORIGIN}/admin/stadium/vending/goods/restock`,  //  售货柜-库存修改保存