1

app/api/controller/Goods.php

@@ -270,4 +270,10 @@ class Goods extends Controller
         $Qrcode = new GoodsPoster($goodsInfo, $userId, $channel);
         return $this->renderSuccess(['imageUrl' => $Qrcode->getImage()]);
     }
+
+   
+
+
+
+
 }

app/api/controller/Order.php

@@ -101,7 +101,7 @@ class Order extends Controller
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function expressSearch(int $expressNo): Json
+    public function expressSearch(string $expressNo): Json
     {
         $items = [
             [
@@ -177,13 +177,14 @@ class Order extends Controller
         // $model = new OrderModel;
         // $counts = $model->getTodoCounts();
         $data = [
-            'reservation_number' => 0,
+            'reservation_number' => 1,
             'view_number' => 0,
             'send_number' => 0,
             'integral_number' => 0,
             'coupon_number' => 0,
             'goods_collect_number' => 0,
             'cart_number' => 0,
+            'take_goods_number' => 1,
         ];
         return $this->renderSuccess($data);
     }
@@ -282,12 +283,12 @@ class Order extends Controller
                 $item['total_price'] = $total_price;
                 $transfer_image_ids = UploadFile::whereIn('file_id', explode(",", $item['transfer_image_id']))->field('file_id,file_path,file_type,storage,domain')->select();
                 foreach ($transfer_image_ids as &$transfer_image_id) {
-                    $transfer_image_id['file_path'] = getUrl($transfer_image_id['file_path']);
+                    $transfer_image_id['file_path'] = getUrl($transfer_image_id['file_path'],$transfer_image_id['domain']);
                 }
 
                 $chat_image_ids = UploadFile::whereIn('file_id', explode(",", $item['chat_image_id']))->field('file_id,file_path,file_type,storage,domain')->select();
                 foreach ($chat_image_ids as &$chat_image_id) {
-                    $chat_image_id['file_path'] = getUrl($chat_image_id['file_path']);
+                    $chat_image_id['file_path'] = getUrl($chat_image_id['file_path'], $chat_image_id['domain']);
                 }
                 $item['transfer_image_ids'] = $transfer_image_ids;
                 $item['chat_image_ids'] = $chat_image_ids;

app/api/service/User.php

@@ -129,8 +129,11 @@ class User extends UserService
     public static function isStore(): bool
     {
         $userInfo = static::getCurrentLoginUser(true);
+
         if ($userInfo && $userInfo['user_type'] == UserTypeEnum::STORE) {
+
             $userId = $userInfo['user_id'];
+           
             //商家表里有没有
             $model = new \app\common\model\store\User();
             $store_id = $model->where(['user_id' => $userId])->value('store_id');

public/admin/config.js

@@ -3,8 +3,9 @@ window.serverConfig = {
   APP_NAME: '萤火商城系统2.0',
   // 必填: api地址, 换成自己的域名即可
   // 例如: https://www.你的域名.com/index.php?s=/admin
-  BASE_API: 'https://www.saas.njrenzhou.com/index.php?s=/admin',
+  // BASE_API: 'https://www.saas.njrenzhou.com/index.php?s=/admin',
+  BASE_API: 'https://www.royaum.com.cn/index.php?s=/admin',
   // 必填: store模块的入口地址
   // 例如: https://www.你的域名.com/store
-  STORE_URL: 'https://www.saas.njrenzhou.com/store',
+  STORE_URL: 'https://www.saas.njrenzhou.com/store'
 }

public/admin/css/cloud.7579e803.css

@@ -0,0 +1 @@
+.my-description[data-v-1e37461c]{margin-bottom:20px;font-size:13px!important}.my-description p[data-v-1e37461c]{margin-bottom:5px}.my-description[data-v-1e37461c] .ant-alert-description{font-size:13px}.update-list[data-v-1e37461c]{overflow:hidden;font-size:14px;padding:20px 0;margin-top:20px}.log-item[data-v-1e37461c]{display:-webkit-box;display:-ms-flexbox;display:flex}.log-item:last-child .log-content[data-v-1e37461c]{padding-bottom:10px}.log-item .col-left[data-v-1e37461c]{width:200px}.log-item .col-right[data-v-1e37461c]{width:800px}.update-date[data-v-1e37461c]{position:relative;height:100%;padding-right:46px;font-size:14px;text-align:right}.update-date[data-v-1e37461c]:after{content:"";width:1px;height:100%;display:block;border-left:1px solid #ccc;margin-right:10px;position:absolute;right:0;top:22px}.update-date .dcircle[data-v-1e37461c]{width:22px;height:22px;border-radius:50%;background:#d7e6f9;position:absolute;right:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.update-date .dcircle .dcircle2[data-v-1e37461c]{width:10px;height:10px;border-radius:50%;background:#51a7f7}.update-date .date[data-v-1e37461c]{padding-top:3px}.log-content[data-v-1e37461c]{padding-top:3px;padding-left:45px;padding-bottom:50px;min-height:80px}.log-content .log-title[data-v-1e37461c]{margin-bottom:15px}.log-content .actions[data-v-1e37461c]{margin-left:22px;font-size:13px}.log-content .actions a[data-v-1e37461c]{margin-right:8px}.log-content .update-log[data-v-1e37461c]{white-space:pre!important;line-height:22px;color:#999;font-size:13px}.message[data-v-36b20d24]{margin-bottom:16px}.authorize[data-v-36b20d24]{padding:10px 0;font-size:12.6px}.info-item[data-v-36b20d24]{margin-bottom:15px}.info-item .label[data-v-36b20d24],.info-item .value[data-v-36b20d24]{display:inline-block}.info-item .label[data-v-36b20d24]{width:100px;text-align:right}.info-item .notes[data-v-36b20d24]{margin-left:5px;font-size:12px}

public/admin/css/menu.36bb5c75.css

@@ -0,0 +1 @@
+.ant-tag[data-v-669d76dd]{cursor:pointer}.ant-tag[data-v-669d76dd]:hover{border:1px solid #fb9a9a;color:#fb9a9a}.formContent[data-v-7befcb3a]{display:-webkit-box;display:-ms-flexbox;display:flex;margin-bottom:10px}.formContent .formItem[data-v-7befcb3a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.formContent .formItem .formTitle[data-v-7befcb3a]{display:inline-block;width:70px;text-align:right;margin-right:10px}

public/admin/css/menu.7ee54aaa.css

@@ -1 +0,0 @@
-.ant-tag[data-v-41a42e0b]{cursor:pointer}.ant-tag[data-v-41a42e0b]:hover{border:1px solid #fb9a9a;color:#fb9a9a}.formContent[data-v-5fde673a]{display:-webkit-box;display:-ms-flexbox;display:flex;margin-bottom:10px}.formContent .formItem[data-v-5fde673a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.formContent .formItem .formTitle[data-v-5fde673a]{display:inline-block;width:50px;text-align:right;margin-right:5px}

public/admin/css/setting.76abad65.css

@@ -0,0 +1 @@
+.ant-table-wrapper[data-v-d7f7fd92] .normal .status-icon{color:#4db14d}.ant-table-wrapper[data-v-d7f7fd92] .warning{background-color:#ffd!important}.ant-table-wrapper[data-v-d7f7fd92] .danger{color:#dd514c;background-color:rgba(221,81,76,.115)}.ant-table-wrapper[data-v-d7f7fd92] .danger .status-icon{color:red}.content[data-v-58c1a092]{padding:20px 30px}.content .title[data-v-58c1a092]{margin-top:50px;margin-bottom:10px;font-size:15px}.content .title[data-v-58c1a092]:first-child{margin-top:0}.content .text[data-v-58c1a092]{margin:6px 0}.content[data-v-01c45f59]{padding:20px 30px}.content .title[data-v-01c45f59]{margin-top:50px;margin-bottom:10px;font-size:15px}.content .title[data-v-01c45f59]:first-child{margin-top:0}.content .text[data-v-01c45f59]{margin:6px 0}

public/admin/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>超级管理后台</title><style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style><link href="css/menu.7ee54aaa.css" rel="prefetch"><link href="css/store.bbb0f5dd.css" rel="prefetch"><link href="css/user.a645b22a.css" rel="prefetch"><link href="js/fail.306fabae.js" rel="prefetch"><link href="js/menu.272ee7b9.js" rel="prefetch"><link href="js/setting.859a6751.js" rel="prefetch"><link href="js/store.890f3315.js" rel="prefetch"><link href="js/user.d1003ca6.js" rel="prefetch"><link href="css/app.8c279721.css" rel="preload" as="style"><link href="css/chunk-vendors.23cf87cf.css" rel="preload" as="style"><link href="js/app.86f18b10.js" rel="preload" as="script"><link href="js/chunk-vendors.597463c4.js" rel="preload" as="script"><link href="css/chunk-vendors.23cf87cf.css" rel="stylesheet"><link href="css/app.8c279721.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><div id="loading-mask"><div class="loading-wrapper"><span class="loading-dot loading-dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script src="config.js"></script><script src="js/chunk-vendors.597463c4.js"></script><script src="js/app.86f18b10.js"></script></body></html>
+<!DOCTYPE html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>超级管理后台</title><style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style><link href="css/cloud.7579e803.css" rel="prefetch"><link href="css/menu.36bb5c75.css" rel="prefetch"><link href="css/setting.76abad65.css" rel="prefetch"><link href="css/store.5ddc59eb.css" rel="prefetch"><link href="css/user.c919777a.css" rel="prefetch"><link href="js/cloud.744464c5.js" rel="prefetch"><link href="js/fail.2e197142.js" rel="prefetch"><link href="js/menu.a93ade6e.js" rel="prefetch"><link href="js/setting.d83607b1.js" rel="prefetch"><link href="js/store.af72bf9c.js" rel="prefetch"><link href="js/user.dfd88707.js" rel="prefetch"><link href="css/app.611d00b0.css" rel="preload" as="style"><link href="css/chunk-vendors.df6ef1b8.css" rel="preload" as="style"><link href="js/app.c6fd21e3.js" rel="preload" as="script"><link href="js/chunk-vendors.eecae03a.js" rel="preload" as="script"><link href="css/chunk-vendors.df6ef1b8.css" rel="stylesheet"><link href="css/app.611d00b0.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><div id="loading-mask"><div class="loading-wrapper"><span class="loading-dot loading-dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script src="config.js"></script><script src="js/chunk-vendors.eecae03a.js"></script><script src="js/app.c6fd21e3.js"></script></body></html>

public/admin/js/setting.859a6751.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["setting"],{"9b7d":function(a,e,t){"use strict";t.r(e);var o=function(){var a=this,e=a._self._c;return e("a-card",{attrs:{bordered:!1}},[e("content-header",{attrs:{title:"清理缓存"}}),e("a-form",{attrs:{form:a.form}},[e("a-form-item",{attrs:{label:"缓存项目",labelCol:{span:6},wrapperCol:{span:13}}},[e("a-checkbox-group",{directives:[{name:"decorator",rawName:"v-decorator",value:["item",{initialValue:["data","temp"]}],expression:"['item', { initialValue: ['data', 'temp'] }]"}]},[e("a-checkbox",{attrs:{value:"data"}},[a._v("数据缓存")]),e("a-checkbox",{attrs:{value:"temp"}},[a._v("临时图片")])],1)],1),e("a-form-item",{attrs:{label:"强制模式",labelCol:{span:6},wrapperCol:{span:13},extra:"强制清空所有缓存文件，包含用户授权登录状态的数据，正式环境中请勿勾选"}},[e("a-switch",{directives:[{name:"decorator",rawName:"v-decorator",value:["isForce",{valuePropName:"checked"}],expression:"['isForce', { valuePropName: 'checked' }]"}]})],1),e("a-form-item",{attrs:{wrapperCol:{span:13,offset:6}}},[e("a-button",{attrs:{type:"primary",loading:a.isLoading,disabled:a.isLoading},on:{click:a.handleSubmit}},[a._v("提交")])],1)],1)],1)},r=[],n=(t("d3b7"),t("f6ae")),i=t("b775");function s(a){return Object(i["b"])({url:n["a"].setting.cache.clear,method:"post",data:a})}var c=t("2af9"),l=t("4360"),d={name:"TableList",components:{ContentHeader:c["a"],STable:c["d"]},data:function(){return{isLoading:!1,form:this.$form.createForm(this)}},created:function(){},methods:{handleSubmit:function(){var a=this,e=this.form.validateFields;e((function(e,t){e||(a.isLoading=!0,a.onFormSubmit(t).finally((function(){return a.isLoading=!1})))}))},onFormSubmit:function(a){var e=this;return s({form:a}).then((function(t){e.$message.success(t.message),!0===a.isForce&&l["a"].dispatch("Logout").then((function(){setTimeout((function(){window.location.reload()}),1200)}))}))}}},u=d,m=t("2877"),p=Object(m["a"])(u,o,r,!1,null,null,null);e["default"]=p.exports}}]);