【程序目录】更新

2026-10-29 05:50:50 +00:00 · 2025-09-11 10:48:14 +08:00 · 2025-09-11 10:48:14 +08:00 · b8c2a9aa1d
commit b8c2a9aa1d
parent c65642db29
17 changed files with 98 additions and 38 deletions
--- a/crmeb/app/adminapi/controller/v1/system/SystemDatabackup.php
+++ b/crmeb/app/adminapi/controller/v1/system/SystemDatabackup.php
@ -75,7 +75,19 @@ class SystemDatabackup extends AuthController
        if ($is_field == 0) {
            $sql = "ALTER TABLE $table COMMENT '$mark'";
        } else {
-            $sql = "ALTER TABLE $table MODIFY COLUMN $field $type COMMENT '$mark'";
+            $fieldInfo = Db::query("SHOW FULL COLUMNS FROM `{$table}` WHERE Field = '{$field}'");
+            $sql = "ALTER TABLE $table MODIFY COLUMN ";
+            $sql .= $field . ' ' . $type . ' ';
+            if ($fieldInfo[0]['Null'] == 'NO') {
+                $sql .= 'NOT NULL ';
+                if (!is_null($fieldInfo[0]['Default'])) {
+                    $sql .= "DEFAULT '" . $fieldInfo[0]['Default'] . "' ";
+                }
+            }
+            if ($fieldInfo[0]['Extra']) {
+                $sql .= $fieldInfo[0]['Extra'] . ' ';
+            }
+            $sql .= "COMMENT '$mark'";
        }
        Db::execute($sql);
        return app('json')->success(100024);
--- a/crmeb/app/listener/order/OrderShippingListener.php
+++ b/crmeb/app/listener/order/OrderShippingListener.php
@ -16,7 +16,7 @@ class OrderShippingListener implements ListenerInterface
    public function handle($event): void
    {
        /** @var StoreOrder $order */
-        [$order_type, $order, $delivery_type, $delivery_id, $delivery_code] = $event;
+        [$order_type, $order, $delivery_type, $delivery_id, $delivery_name] = $event;
        $order_shipping_open = sys_config('order_shipping_open', 0);  // 小程序发货信息管理服务开关
        $secs = 0;
        if ($order && $order_shipping_open) {
@ -80,14 +80,27 @@ class OrderShippingListener implements ListenerInterface
            if (!isset($order['shipping_type']) || $order['shipping_type'] == 1) {
                if ($delivery_type == 1) {
                    //仅实现默认的快递公司
-                    $expressData = ['韵达快递' => 'YD','顺丰速运' => 'SF','圆通速递' => 'YTO','中通快递' => 'ZTO',
-                        '申通快递' => 'STO','百世快递' => 'HTKY','京东物流' => 'JD','极兔速递' => 'JTSD',
-                        '邮政快递包裹' => 'YZPY','EMS' => 'EMS','德邦快递' => 'DBL','宅急送' => 'ZJS',
+                    $expressData = [
+                        '韵达快递' => 'YD',
+                        '顺丰速运' => 'SF',
+                        '圆通速递' => 'YTO',
+                        '中通快递' => 'ZTO',
+                        '申通快递' => 'STO',
+                        '百世快递' => 'HTKY',
+                        '京东物流' => 'JD',
+                        '极兔速递' => 'JTSD',
+                        '邮政快递包裹' => 'YZPY',
+                        'EMS' => 'EMS',
+                        '德邦快递' => 'DBL',
+                        '德邦物流' => 'DBLKY',
+                        '宅急送' => 'ZJS',
+                        '优速快递' => 'UC',
+                        '苏宁物流' => 'SNWL',
                    ];
                    $shipping_list = [
                        [
                            'tracking_no' => $delivery_id ?? '',
-                            'express_company' => $delivery_code,
+                            'express_company' => $expressData[$delivery_name] ?? '',
                            'item_desc' => $item_desc,
                            'contact' => [
                                'receiver_contact' => $order['user_phone']
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@ -502,7 +502,7 @@ if ($type == 'order') {
            $data['delivery_id'] = uniqid();
        }
        // 小程序订单管理
-        event('OrderShippingListener', ['product', $orderInfo, $type, $data['delivery_id'], $data['delivery_code']]);
+        event('OrderShippingListener', ['product', $orderInfo, $type, $data['delivery_id'], $data['delivery_name']]);
        //到期自动收货
        event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]);

--- a/crmeb/app/services/user/UserBillServices.php
+++ b/crmeb/app/services/user/UserBillServices.php
@ -1192,8 +1192,8 @@ class UserBillServices extends BaseServices
        $storeOrderServices = app()->make(StoreOrderServices::class);
        [$page, $limit] = $this->getPageValue();
        $time = [];
-        $where = ['paid' => 1, 'type' => 6, 'spread_or_uid' => $uid, 'pid' => 0, 'refund_status' => 0];
-        $list = $storeOrderServices->getlist($where, ['id,order_id,uid,add_time,spread_uid,status,spread_two_uid,one_brokerage,two_brokerage,pay_price,pid'], $page, $limit, ['split']);
+        $where = ['paid' => 1, 'type' => 6, 'all_spread' => $uid, 'pid' => 0, 'refund_status' => 0];
+        $list = $storeOrderServices->getlist($where, ['id,order_id,uid,add_time,spread_uid,status,spread_two_uid,one_brokerage,two_brokerage,pay_price,pid,staff_id,agent_id,division_id,staff_brokerage,agent_brokerage,division_brokerage'], $page, $limit, ['split']);
        $result['count'] = $storeOrderServices->count($where);
        $time_data = [];
        if ($list) {
@ -1202,7 +1202,15 @@ class UserBillServices extends BaseServices
            foreach ($list as &$item) {
                $item['avatar'] = $userInfos[$item['uid']]['avatar'] ?? '';
                $item['nickname'] = $userInfos[$item['uid']]['nickname'] ?? '';
-                $item['number'] = $item['spread_uid'] == $uid ? $item['one_brokerage'] : $item['two_brokerage'];
+                if ($item['division_id'] == $uid) {
+                    $item['number'] = $item['division_brokerage'];
+                } elseif ($item['agent_id'] == $uid) {
+                    $item['number'] = $item['agent_brokerage'];
+                } elseif ($item['staff_id'] == $uid) {
+                    $item['number'] = $item['staff_brokerage'];
+                } else {
+                    $item['number'] = $item['spread_uid'] == $uid ? $item['one_brokerage'] : $item['two_brokerage'];
+                }
                $item['time'] = $item['add_time'] ? date('Y-m-d H:i', $item['add_time']) : '';
                $item['time_key'] = $item['add_time'] ? date('Y-m', $item['add_time']) : '';
                $item['type'] = in_array($item['status'], [2, 3]) ? 'brokerage' : 'number';
--- a/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub
+++ b/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub
@ -82,7 +82,7 @@ export default {
           this.dialogTableVisible = true;
           this.info = res.data;
        }).catch(res => {
-          this.$Message.error(res.msg);
+          this.$message.error(res.msg);
        })
    },
    //修改状态
@ -116,7 +116,7 @@ export default {
          })
          .catch((res) => {
            this.loading = false;
-            this.$Message.error(res.msg);
+            this.$message.error(res.msg);
          });
    },
    //分页
@ -139,11 +139,11 @@ export default {
      };
      this.$modalSure(delfromData)
          .then((res) => {
-            this.$Message.success(res.msg);
+            this.$message.success(res.msg);
            this.getList();
          })
          .catch((res) => {
-            this.$Message.error(res.msg);
+            this.$message.error(res.msg);
          });
    },
  },
--- a/template/admin/src/pages/agent/handle/promotersList.vue
+++ b/template/admin/src/pages/agent/handle/promotersList.vue
@ -138,6 +138,11 @@
              <span>{{ scope.row.agent_brokerage || 0 }}</span>
            </template>
          </el-table-column>
+          <el-table-column label="员工返佣金额" min-width="130" v-if="rowsList.division_type == 3">
+            <template slot-scope="scope">
+              <span>{{ scope.row.staff_brokerage || 0 }}</span>
+            </template>
+          </el-table-column>
        </template>
      </el-table>
      <div class="acea-row row-right page">
--- a/template/admin/src/pages/marketing/storeBargain/create.vue
+++ b/template/admin/src/pages/marketing/storeBargain/create.vue
@ -710,7 +710,7 @@ export default {
          is_hot: row.is_hot,
          status: 0,
          section_time: [],
-          description: row.description, // 不取商品中的
+          description: '', // 不取商品中的
          rule: '',
          id: 0,
          product_id: row.id,
@ -830,9 +830,9 @@ export default {
              }
            }
            this.current += 1;
-            setTimeout((e) => {
-              this.formValidate.description += ' ';
-            }, 0);
+            // setTimeout((e) => {
+            //   this.formValidate.description += ' ';
+            // }, 0);
          } else {
            return this.$message.warning('请完善您的信息');
          }
--- a/template/admin/src/pages/marketing/storeCombination/create.vue
+++ b/template/admin/src/pages/marketing/storeCombination/create.vue
@ -763,7 +763,7 @@ export default {
          is_host: row.is_hot,
          is_show: 0,
          section_time: [],
-          description: row.description, // 不取商品中的
+          description: '', // 不取商品中的
          id: 0,
          people: 2,
          num: 1,
--- a/template/admin/src/pages/marketing/storeIntegral/create.vue
+++ b/template/admin/src/pages/marketing/storeIntegral/create.vue
@ -507,7 +507,7 @@ export default {
          is_postage: row.is_postage,
          is_host: 0,
          is_show: 1,
-          description: row.description,
+          description: '',
          id: 0,
          product_id: row.id,
          temp_id: row.temp_id,
--- a/template/admin/src/pages/marketing/storePresell/create.vue
+++ b/template/admin/src/pages/marketing/storePresell/create.vue
@ -590,7 +590,7 @@ export default {
          // type: 1,
          num: 1,
          deposit: 1,
-          description: row.description, // 不取商品中的
+          description: '', // 不取商品中的
          id: 0,
          num: 1,
          status: 1,
--- a/template/admin/src/pages/marketing/storeSeckill/create.vue
+++ b/template/admin/src/pages/marketing/storeSeckill/create.vue
@ -685,7 +685,7 @@ export default {
          is_postage: row.is_postage,
          is_hot: row.is_hot,
          status: 0,
-          description: row.description,
+          description: '',
          id: 0,
          product_id: row.id,
          temp_id: row.temp_id,
--- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
@ -129,6 +129,31 @@
                </li>
              </ul>
            </div>
+            <div class="section">
+              <div class="title">返佣信息(金额｜用户UID)</div>
+              <ul class="list">
+                <li class="item">
+                  <div>一级佣金：</div>
+                  <div class="value">{{ orderDatalist.orderInfo.one_brokerage }} | {{ orderDatalist.orderInfo.spread_uid }}</div>
+                </li>
+                <li class="item">
+                  <div>二级佣金：</div>
+                  <div class="value">{{ orderDatalist.orderInfo.two_brokerage }} | {{ orderDatalist.orderInfo.spread_two_uid }}</div>
+                </li>
+                <li class="item">
+                  <div>员工返佣：</div>
+                  <div class="value">{{ orderDatalist.orderInfo.staff_brokerage }} | {{ orderDatalist.orderInfo.staff_id }}</div>
+                </li>
+                <li class="item">
+                  <div>代理商佣金：</div>
+                  <div class="value">{{ orderDatalist.orderInfo.agent_brokerage }} | {{ orderDatalist.orderInfo.agent_id }}</div>
+                </li>
+                <li class="item">
+                  <div>事业部佣金：</div>
+                  <div class="value">{{ orderDatalist.orderInfo.division_brokerage }} | {{ orderDatalist.orderInfo.division_id }}</div>
+                </li>
+              </ul>
+            </div>
            <div class="section" v-if="orderDatalist.orderInfo.delivery_name">
              <div class="title">
                {{ orderDatalist.orderInfo.delivery_type == 'express' ? '物流信息' : '送货人信息' }}
--- a/template/admin/src/pages/product/productAdd/productAdd.scss
+++ b/template/admin/src/pages/product/productAdd/productAdd.scss
@ -342,7 +342,7 @@
 .ifam {
  width: 344px;
  height: 644px;
-  background: url('~/assets/images/phonebg.png') no-repeat center top;
+  background: url('~@/assets/images/phonebg.png') no-repeat center top;
  background-size: 344px 644px;
  padding: 40px 20px;
  padding-top: 50px;
--- a/template/admin/src/pages/setting/devise/diyIndex.vue
+++ b/template/admin/src/pages/setting/devise/diyIndex.vue
@ -447,7 +447,7 @@ export default {
        confirmButtonClass: 'btn-custom-cancel',
      })
        .then(() => {
-          this.$router.push('/admin/setting/pages/devise/0');
+          this.$router.push(this.$routeProStr + '/setting/pages/devise/0');
        })
        .catch(() => {});
    },
@ -844,7 +844,7 @@ export default {
          if (num == 2) {
            this.relLoading = false;
            setTimeout(() => {
-              window.location.replace('/admin/setting/pages/devise/0');
+              window.location.replace(this.$routeProStr + '/setting/pages/devise/0');
            }, 2000);
          } else {
            this.loading = false;
--- a/template/admin/src/pages/user/grade/type/index.vue
+++ b/template/admin/src/pages/user/grade/type/index.vue
@ -322,15 +322,7 @@ export default {
                } else {
                  item.props.disabled = false;
                  item.props.min = 1;
-                  item.validate = [
-                    {
-                      type: 'number',
-                      max: 1000000,
-                      min: 0,
-                      message: '最大只能输入1000000,最小为0',
-                      requred: true,
-                    },
-                  ];
+
                }
              }
              if (['price'].includes(key)) {
--- a/template/admin/src/pages/user/list/index.vue
+++ b/template/admin/src/pages/user/list/index.vue
@ -378,6 +378,11 @@
            <div>{{ scope.row.user_type }}</div>
          </template>
        </el-table-column>
+        <el-table-column label="上级用户" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.spread_uid_nickname }}</div>
+          </template>
+        </el-table-column>
        <el-table-column label="余额" prop="now_money" min-width="100" :sortable="true">
          <template slot-scope="scope">
            <div>{{ scope.row.now_money }}</div>
--- a/template/uni-app/components/orderGoods/index.vue
+++ b/template/uni-app/components/orderGoods/index.vue
@ -55,7 +55,7 @@
 						</view>
 						<view class='evaluate' v-else-if="item.is_reply==1">{{$t(`已评价`)}}</view>
 					</view>
-					
+
 				</view>

 				<view class="botton-btn">
@ -220,7 +220,7 @@
 					if (item.type == 0) {
 						url = `/pages/goods_details/index?id=${item.product_id}`
 					} else if (item.type == 1) {
-						url = `/pages/activity/goods_seckill_details/index?id=${item.seckill_id}`
+						url = `/pages/activity/goods_seckill_details/index?id=${item.seckill_id}&time_id=${item.productInfo.time_id}`
 					} else if (item.type == 2) {
 						url = `/pages/activity/goods_bargain_details/index?id=${item.bargain_id}&bargain=${this.uid}`
 					} else if (item.type == 3) {
@ -350,9 +350,9 @@

 	.op {
 		opacity: 0.5;
-		
+
 	}
-	
+
 	.gray {
 		filter: grayscale(100%);
 		filter: gray;