update

java-mall-app-shop-admin/.hbuilderx/launch.json

@@ -24,7 +24,7 @@
         },
         {
             "customPlaygroundType" : "device",
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

java-mall-app-shop-admin/api/warehouse/productList.js

@@ -35,6 +35,23 @@ export function GetProductList(params) {
   });
 }
 
+/** 根据条形码查询商品信息
+ *
+ * @author mixtan
+ * @data 2025-10-30
+ * @param { productNumber }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-base/getProductByProductNumber
+ */
+export function GetProductByProductNumber(params) {
+  return http({
+    url: "/shop/shop-product-base/getProductByProductNumber",
+    method: "get",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
 /** 更新商品上下架
  *
  * @author Seven

java-mall-app-shop-admin/manifest.json

@@ -4,8 +4,8 @@
     "package" : "com.xiaofa.shopAdmin",
     "description" : "",
     // 版本号更新，不要覆盖版本号，每次发布应用商店要修改版本号
-    "versionName" : "1.0.4",
+    "versionName" : "1.06",
-    "versionCode" : 104,
+    "versionCode" : 106,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

java-mall-app-shop-admin/pages.json

@@ -86,6 +86,12 @@
         "navigationBarTitleText": "忘记密码"
       }
     },
+    {
+      "path": "pages/audit/help",
+      "style": {
+        "navigationBarTitleText": "微信支付商家开通流程指引"
+      }
+    },
     {
       "path": "pages/order/order",
       "style": {

java-mall-app-shop-admin/pages/audit/checkAudit.vue

@@ -10,6 +10,7 @@
         <view class="btn-login-out" @click="loginOut">退出登录</view>
       </template>
     </u-navbar> -->
+
     <navBar
       title="商户入驻申请"
       :statusBar="true"
@@ -29,6 +30,9 @@
         <view class="btn-login-out" @click="loginOut">退出登录</view>
       </block>
     </navBar>
+
+    <u-modal :show="isPassAudit" title="开店成功" content="为了保证您店铺经营的资金能进行分账，请尽快注册微信支付商家！" @confirm="helpConfirm"></u-modal>
+
     <favorite-loading
       class="checkAudit-loading"
       v-show="showLoading"
@@ -581,6 +585,11 @@ export default {
     this.endMinDate = data2.getTime();
   },
   methods: {
+    helpConfirm(){
+       uni.navigateTo({
+            url: "/pages/audit/help",
+          });
+    },
     pageBack() {
       uni.navigateBack();
     },

java-mall-app-shop-admin/pages/audit/help.vue

@@ -0,0 +1,79 @@
+<template>
+  <view class="help">
+    <view class="tit">1、截图保存二维码，微信扫二维码</view>
+    <u--image class="box" mode="aspectFit" src="/static/help/0.jpg"></u--image>
+
+    <view class="tit"
+      >2、关注微信支付商家助手->发消息->微信支付商家注册</view
+    >
+    <u--image class="box" mode="aspectFit" src="/static/help/1.jpg"></u--image>
+
+    <view class="tit">3、去核实</view>
+    <u--image
+      class="box"
+      mode="aspectFit"
+      src="/static/help/101.jpg"
+    ></u--image>
+
+    <view class="tit">4、选择商家主体类型</view>
+    <view class="desc"
+      >如果是营业执照，请选择企业；如果是个人，请选择小微商户，<text class="red">其他类型暂不支持。</text></view
+    >
+    <u--image class="box" mode="aspectFit" src="/static/help/2.jpg"></u--image>
+
+    <view class="tit">5、企业类型->金融类型选择“否”</view>
+    <u--image class="box" mode="aspectFit" src="/static/help/3.jpg?=v1"></u--image>
+
+    <view class="tit">6、企业类型->填写企业资料</view>
+    <u--image
+      class="box"
+      mode="aspectFit"
+      src="/static/help/301.jpg?=v1"
+    ></u--image>
+
+    <view class="tit">6、小微商户类型->填写个人资料</view>
+    <u--image class="box" mode="aspectFit" src="/static/help/4.jpg"></u--image>
+
+    <view class="tit">7、小微商户类型->填写辅佐证明材料->经营类型</view>
+     <view class="desc"
+      ><text class="red">经营类型栏目，一定要选择[线上商品/服务交易]，否则无法正常营业分账。</text></view
+    >
+    <u--image
+      class="box"
+      mode="aspectFit"
+      src="/static/help/401.jpg"
+    ></u--image>
+  </view>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="scss" scoped>
+.help {
+    padding: 32rpx 0;
+  .tit {
+    font-size: 40rpx;
+    padding: 0 32rpx;
+  }
+  .desc {
+    font-size: 32rpx;
+    padding: 0 32rpx 24rpx;
+    color: #666;
+  }
+  ::v-deep .box {
+    padding-top: 24rpx;
+    padding-bottom: 48rpx;
+  }
+  ::v-deep .u-image {
+    width: 100% !important;
+    height: auto !important;
+    align-items: center;
+  }
+}
+.red{
+    color: red;
+   font-size: 32rpx;
+}
+</style>

java-mall-app-shop-admin/pages/audit/shop1.vue

@@ -30,13 +30,20 @@
       </block>
     </navBar>
     <u-form :model="form" class="form" ref="uForm" label-width="70">
-      <u-form-item label="联系人" prop="contact_name" required>
+      <u-form-item label="门店名称" prop="store_name" required>
         <u-input
           class="form-input"
-          v-model="form.contact_name"
+          v-model="form.store_name"
-          placeholder="请输入联系人"
+          placeholder="请输入门店名称"
           clearable
         />
+        <u-button
+          slot="right"
+          class="btn-check-shop-name"
+          @click="handleBtnCheckShopName"
+        >
+          检查名字
+        </u-button>
       </u-form-item>
       <u-form-item
         label="经营品类"
@@ -58,21 +65,6 @@
           color="#aaaaaa"
         ></u-icon>
       </u-form-item>
-      <u-form-item label="门店名称" prop="store_name" required>
-        <u-input
-          class="form-input"
-          v-model="form.store_name"
-          placeholder="请输入门店名称"
-          clearable
-        />
-        <u-button
-          slot="right"
-          class="btn-check-shop-name"
-          @click="handleBtnCheckShopName"
-        >
-          检查名字
-        </u-button>
-      </u-form-item>
       <u-form-item
         label="所在地区"
         prop="mapAddress"
@@ -93,8 +85,10 @@
           color="aaaaaa"
         ></u-icon>
       </u-form-item>
-      <u-form-item label="详细地址" prop="store_address" required>
+      <u-form-item label="详细地址" prop="store_address" required @click="handleStoreAddressClick">
         <u-input
+          :disabled="!form.mapAddress"
+          :style="{pointerEvents: !form.mapAddress?'none':'auto'}"
           class="form-input"
           v-model="form.store_address"
           @input="handleStoreAddressInput"
@@ -102,6 +96,14 @@
           clearable
         />
       </u-form-item>
+      <u-form-item label="联系人" prop="contact_name" required>
+        <u-input
+          class="form-input"
+          v-model="form.contact_name"
+          placeholder="请输入联系人"
+          clearable
+        />
+      </u-form-item>
       <u-form-item label="门脸图" prop="front_facade_image">
         <u-upload
           :class="fileList.length == 0 ? 'shop1-upload' : 'shop1-upload-item'"
@@ -287,6 +289,15 @@ export default {
         url: "/pages/audit/mapAddress",
       });
     },
+    handleStoreAddressClick() {
+      if (!this.form.mapAddress) {
+        uni.showModal({
+          content: "先选择所在地区，再填写详细地址",
+          confirmText: "知道了",
+          showCancel: false,
+        });
+      }
+    },
     handleStoreAddressInput(e) {
       setTimeout(() => {
         let locationItem = uni.getStorageSync("locationItem");
@@ -303,6 +314,14 @@ export default {
         });
         return;
       }
+      if (!this.form.mapAddress) {
+        uni.showModal({
+          content: "先选择所在地区，再填写详细地址",
+          confirmText: "知道了",
+          showCancel: false,
+        });
+        return;
+      }
 
       this.$refs.uForm.validate().then((valid) => {
         if (valid) {
@@ -469,6 +488,7 @@ export default {
     border: none;
     background: $base-color;
     color: #fff;
+    font-size: 24rpx !important;
   }
 
   .btn-next {
@@ -476,5 +496,14 @@ export default {
     color: #fff;
     border: none;
   }
+
+  ::v-deep.u-upload__deletable {
+    width: 64rpx;
+    height: 64rpx;
+    .u-icon__icon {
+      font-size: 48rpx !important;
+      line-height: 48rpx !important;
+    }
+  }
 }
 </style>

java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue

@@ -104,6 +104,20 @@
             @result="handerResultUrl($event, 'vice')"
           ></imgUpload>
         </u-form-item>
+        <u-form-item label="条形码" prop="product_number" class="form-item">
+          <u--input
+            v-model="form.product_number"
+            disabled
+            disabledColor="#ffffff"
+            border="none"
+          ></u--input>
+          <u-icon
+            slot="right"
+            name="scan"
+            size="24"
+            @click="handleScanCode()"
+          ></u-icon>
+        </u-form-item>
         <u-form-item
           label="商品卖点"
           prop="product_tips"
@@ -429,6 +443,7 @@
 <script>
 import navBar from "@/components/uni-nav-bar/uni-nav-bar";
 import { mapState } from "vuex";
+
 import { GetCommodityClassify } from "@/api/warehouse/classifyList";
 import imgUpload from "@/components/poiuy-uImgUpload/imgUpload.vue";
 import {
@@ -438,10 +453,309 @@ import {
   GetClassifyInfo,
   GetCommoditSpecificationBaseInfo,
 } from "@/api/warehouse/commodity";
-import { DelectCommodity } from "@/api/warehouse/productList";
+import {
+  DelectCommodity,
+  GetProductByProductNumber,
+} from "@/api/warehouse/productList";
 import tkiTree from "./components/tree/tree";
 import specificationOfGood from "./specificationOfGood.vue";
 import store from "../../../store";
+
+const mydata = {
+  code: 0,
+  status: 200,
+  msg: "操作成功！",
+  data: {
+    baseInfo: [
+      {
+        product_subtract: 1,
+        product_image:
+          "https://static.gpxscs.cn/media/images/goods_library/20250720/5f9ffeba78b242cb8277ad1ad0773899.jpg",
+        product_from: 1005,
+        product_uniqid: "[]",
+        specUnit: null,
+        product_sale_time: "2035-10-29 20:48:19",
+        product_number: "6931780721530",
+        is_special: "0",
+        product_id: 165036,
+        product_currency: "",
+        product_commission_rate: 0.0,
+        product_fx_enable: 0,
+        product_order: 50,
+        product_model: "",
+        product_user_level_discount: 1,
+        transport_type_id: 16,
+        product_barcode: "",
+        product_from_url: "",
+        product_unit_points: 0,
+        product_name: "天地壹号苹果醋铂金版330ml（12+3）",
+        unit_name: null,
+        product_seo_url: "",
+        product_verify_id: 3001,
+        specItem: null,
+        product_inventory_lock: 1002,
+        product_buy_limit: 0,
+        product_weight: 0.0,
+        unit_type_id: 0,
+        product_unit_sp: 0,
+        product_src_id: 165036,
+        product_country: "",
+        productItems: null,
+        product_cubage: "0.00",
+        layout_route_id: 0,
+        product_dist_enable: 0,
+        store_name: "聚万家生鲜超市",
+        unit_id: 0,
+        store_id: 69,
+        shop_weight: 500.0,
+        product_state_id: 1002,
+        tax_class_id: 0,
+        product_shop_card_discount: 1,
+        product_video: "",
+        product_unit_price: 5.0,
+        unit_price: 5.0,
+        spec_ids: "",
+        product_tips: "",
+        product_advice_price: 5.0,
+        product_spec: [],
+        product_assist: "",
+        unit_weight_id: 1,
+        unit_length_id: 1,
+        product_cost_price: 0.0,
+        product_market_price: 5.0,
+        categoryId: null,
+        product_add_time: 1758782031885,
+      },
+    ],
+    shopBaseProductType: {
+      specs: [
+        {
+          spec_id: 1510,
+          spec_name: "苹果醋规格",
+          spec_remark: "",
+          spec_format: "text",
+          spec_order: 50,
+          spec_category_id: 848,
+          spec_buildin: 0,
+          specItems: [],
+          store_id: 69,
+          store_name: null,
+        },
+      ],
+      brands: [
+        {
+          brand_id: 68,
+          brand_name: "其它品牌",
+          brand_name_pinyin: "qi ta pin pai",
+          brand_initial: "q",
+          brand_desc: "其它品牌",
+          category_id: 0,
+          brand_show_type: 1,
+          brand_image: "",
+          brand_recommend: 0,
+          brand_enable: 1,
+          store_id: 69,
+          brand_apply: 1,
+        },
+      ],
+      assists: [],
+    },
+    category: {
+      category_id: 848,
+      category_parent_id: 0,
+      category_name: "苹果醋",
+      category_image:
+        "https://static.gpxscs.cn/media/images/goods_library/20250820/5dd97b994af64e7dad1db0b0f4872d9a.jpg",
+      type_id: 1452,
+      category_virtual_enable: 0,
+      category_show_type: "COLOR",
+      category_commission_rate: 0.0,
+      category_order: 50,
+      category_level: 0,
+      category_is_leaf: 1,
+      category_is_enable: 0,
+      page_id: 0,
+      page_id_pc: 0,
+      data_source: 2,
+      store_id: "69",
+      sub: null,
+      id: null,
+      parent_id: null,
+      name: null,
+      category_icon: "ui-icon-star",
+      category_expanded: true,
+      category_loaded: true,
+      type_name: null,
+      store_name: null,
+    },
+    items: [
+      {
+        item_id: 238819,
+        item_name: "",
+        product_id: 165036,
+        course_category_id: 0,
+        color_id: 0,
+        item_is_default: 1,
+        item_number: "6931780721530",
+        item_barcode: "6931780721530",
+        item_cost_price: 0.0,
+        item_platform_price: 0.0,
+        item_advice_price: 5.0,
+        item_unit_price: 5.0,
+        item_market_price: 5.0,
+        item_unit_points: 0.0,
+        item_unit_sp: 0.0,
+        item_quantity: 500,
+        item_quantity_frozen: 0,
+        item_warn_quantity: 0,
+        item_spec: "[]",
+        spec_item_ids: "",
+        item_enable: 1001,
+        item_is_change: 0,
+        item_weight: 0.0,
+        item_fx_commission: 0.0,
+        item_rebate: 0.0,
+        item_title: "",
+        item_freetime: 0,
+        item_src_id: "238819",
+        category_id: 848,
+        store_id: 69,
+        item_unit_price_1001: 0.0,
+        item_unit_price_1002: 0.0,
+        item_unit_price_1003: 0.0,
+        item_unit_price_1004: 0.0,
+        item_unit_price_1005: 0.0,
+        item_unit_price_1006: 0.0,
+        item_unit_price_1007: 0.0,
+        item_unit_price_1008: 0.0,
+        item_unit_price_1009: 0.0,
+        item_purchase_price: 0.0,
+        item_purchase_rate: 0.0,
+        item_sales_rate: 0.0,
+        version: 0,
+        mergedItemId: null,
+        mergedUnitPrices: null,
+        automatic: null,
+        is_open_automatic: "0",
+      },
+    ],
+    productInfo: {
+      shop_product_detail: {
+        product_id: 165036,
+        product_detail: "",
+        product_param: "",
+        product_service: "",
+        product_meta_title: "",
+        product_meta_description: "",
+        product_meta_keyword: "",
+        product_tags: "",
+      },
+      shop_product_image: [
+        {
+          product_image_id: 167557,
+          product_id: 165036,
+          store_id: 69,
+          color_id: 0,
+          color_name: "",
+          item_image_default:
+            "https://static.gpxscs.cn/media/images/goods_library/20250720/5f9ffeba78b242cb8277ad1ad0773899.jpg",
+          item_image_other:
+            "https://static.gpxscs.cn/media/images/goods_library/20250720/5f9ffeba78b242cb8277ad1ad0773899.jpg",
+          item_image_diy: "",
+          item_video: "",
+          item_image_ext_1: "",
+          item_image_ext_2: "",
+          product_number: "6931780721530",
+          product_name: "天地壹号苹果醋铂金版330ml（12+3）",
+          product_from: "1005",
+        },
+      ],
+      shop_product_assist_index: [],
+      shop_product_info: {
+        product_id: 165036,
+        product_number: "6931780721530",
+        product_barcode: "",
+        product_model: "",
+        product_assist: "",
+        product_spec: "[]",
+        spec_ids: "",
+        product_uniqid: "[]",
+        unit_length_id: 1,
+        unit_weight_id: 1,
+        product_weight: 0.0,
+        product_cubage: "0.00",
+        product_subtract: 1,
+        unit_type_id: 0,
+        tax_class_id: 0,
+        product_buy_limit: 0,
+        product_user_level_discount: 1,
+        product_shop_card_discount: 1,
+      },
+      shop_product_index: {
+        product_id: 165036,
+        product_name: "天地壹号苹果醋铂金版330ml（12+3）",
+        product_name_index: "天地壹号苹果醋铂金版330ml（12+3）",
+        store_id: 69,
+        store_is_open: 1,
+        store_type: 1,
+        store_category_ids: "",
+        category_id: 848,
+        course_category_id: 0,
+        category_ids: "",
+        type_id: 1452,
+        product_quantity: 0,
+        product_warn_quantity: 0,
+        brand_id: 68,
+        product_service_type_ids: "",
+        product_state_id: 1002,
+        product_verify_id: 3001,
+        product_is_invoices: 0,
+        product_is_return: 1,
+        product_is_recommend: 0,
+        product_stock_status: 1,
+        kind_id: 1201,
+        activity_type_ids: "",
+        contract_type_ids: "",
+        product_transport_id: "16",
+        product_assist_data: "",
+        product_add_time: 1758782031885,
+        product_unit_price: 5.0,
+        product_unit_price_max: 0.0,
+        product_unit_points: 0.0,
+        product_unit_sp: 0.0,
+        product_sale_num: 0,
+        product_favorite_num: 0,
+        product_click: 0,
+        product_sale_district_ids: "",
+        product_region_district_ids: "",
+        product_freight: 0.0,
+        product_evaluation_num: 0,
+        product_tags: "",
+        store_is_selfsupport: 1,
+        product_fx_enable: 0,
+        product_dist_enable: 0,
+        product_sale_time: 2077274898815,
+        product_number: "6931780721530",
+        product_order: 50,
+        product_src_id: 165036,
+        market_category_id: "",
+        store_latitude: "23.33033959885149",
+        store_longitude: "110.08898445473912",
+        product_is_video: 0,
+        subsite_id: 0,
+        lecturer_id: 0,
+        card_type_id: 0,
+        voucher_activity_id: "",
+        coupon_type_id: 0,
+        payment_type_id: 0,
+        product_contsign: "",
+        version: 0,
+        is_special: "0",
+      },
+    },
+  },
+};
+
 export default {
   name: "addAndEditProduct",
   props: {
@@ -490,6 +804,7 @@ export default {
         coupon_type_id: "",
         store_id: 0,
       },
+      scans: {},
       productDetail: {
         product_detail: "",
         product_tags: [],
@@ -600,6 +915,7 @@ export default {
   },
 
   mounted() {
+    this.scans = mydata.data;
     this.formData.perm_key = uni.getStorageSync("ukey") || "";
     this.getCommodityClassify();
     if (!this.isAdd) {
@@ -850,6 +1166,35 @@ export default {
     hadnerShowClassifyListPopup() {
       this.$refs.tkitree._show();
     },
+    handleScanCode() {
+      const _this = this;
+      uni.scanCode({
+        success: async function (data) {
+          // console.log("条码类型：" + data.scanType);
+          // console.log("条码内容：" + data.result);
+
+          const res = await GetProductByProductNumber({
+            productNumber: data.result,
+          });
+
+          if (res?.data != null) {
+            _this.primaryImg = res.data?.productInfo.shop_product_image.map(
+              (item) => item.item_image_default
+            );
+            _this.viceImg =
+              res.data?.productInfo.shop_product_image[0].item_image_other.split(
+                ","
+              );
+            console.log("data", res?.data);
+          } else {
+            uni.$u.toast("未查询到您的商品");
+          }
+        },
+        fail: function () {
+          uni.$u.toast("扫码失败,请重试");
+        },
+      });
+    },
     handerRightPopup() {
       if (this.form.category_name == "") {
         this.$refs.uToast.show({
@@ -1088,6 +1433,9 @@ export default {
             zIndex: 12000,
             position: "top",
           });
+
+          this.$emit("goodsEditHandler");
+
           if (this.isAdd) {
             this.form = {
               product_video: "",

java-mall-app-shop-admin/pages/warehouse/manage/productList.vue

@@ -6,7 +6,7 @@
       :border="false"
       :fixed="true"
       :height="'44px'"
-      :rightWidth="0"
+      :rightWidth="24"
       :leftWidth="30"
       backgroundColor="#f5f6fa"
     >
@@ -21,7 +21,7 @@
       <block slot="default">
         <u-search
           class="search"
-          placeholder="搜索你想要的商品"
+          placeholder="请输入商品名称查找"
           :showAction="false"
           bgColor="#fff"
           @focus.native.stop="handleNoFocus"
@@ -29,6 +29,14 @@
           @click="skipuSearch"
         ></u-search>
       </block>
+      <block slot="right">
+        <u-icon
+          name="scan"
+          color="#333"
+          size="24"
+          @click="handleScanCode()"
+        ></u-icon>
+      </block>
     </navBar>
     <view class="productList-content">
       <scroll-view
@@ -126,8 +134,6 @@
                   <u--image
                     class="img-box"
                     :src="item.product_image"
-                    width="64px"
-                    height="64px"
                   ></u--image>
                 </view>
                 <view class="commodity-info-box">
@@ -268,7 +274,7 @@
                     clearable
                     v-model="item.item_unit_price_2"
                     prefixIcon="¥"
-                    type="number"
+                    type="digit"
                   ></u--input>
                 </view>
                 <view class="commodity-info-item">
@@ -308,11 +314,13 @@
     >
       <addAndEditProduct
         @pageBack="handerAddAndEditProductPageBanck"
+        @goodsEditHandler="goodsEditHandler"
         :productItem="productItem"
         :isAdd="isAdd"
       ></addAndEditProduct>
     </u-popup>
     <u-toast ref="uToast"></u-toast>
+    <u-loading-page bg-color="rgba(0,0,0,0.5)" color="#fff" fontSize="16" loadingText="数据加载中..." :loading="isLoadingGoodsData" style="z-index: 999999;"></u-loading-page>
   </view>
 </template>
 
@@ -321,6 +329,7 @@ import {
   GetProductCategoryTree,
   GetProductList,
   UpdateProductPutaway,
+  GetProductByProductNumber,
 } from "@/api/warehouse/productList";
 import {
   GetCommoditSpecification,
@@ -330,6 +339,302 @@ import navBar from "@/components/uni-nav-bar/uni-nav-bar";
 import tuiCollapse from "../manage/components/tui-collapse/tui-collapse.vue";
 import favoriteLoading from "@/components/favorite-loading/favorite-loading.vue";
 import addAndEditProduct from "./addAndEditProduct.vue";
+
+const mydata = {
+  code: 0,
+  status: 200,
+  msg: "操作成功！",
+  data: {
+    baseInfo: [
+      {
+        product_subtract: 1,
+        product_image:
+          "https://static.gpxscs.cn/media/images/goods_library/20250720/5f9ffeba78b242cb8277ad1ad0773899.jpg",
+        product_from: 1005,
+        product_uniqid: "[]",
+        specUnit: null,
+        product_sale_time: "2035-10-29 20:48:19",
+        product_number: "6931780721530",
+        is_special: "0",
+        product_id: 165036,
+        product_currency: "",
+        product_commission_rate: 0.0,
+        product_fx_enable: 0,
+        product_order: 50,
+        product_model: "",
+        product_user_level_discount: 1,
+        transport_type_id: 16,
+        product_barcode: "",
+        product_from_url: "",
+        product_unit_points: 0,
+        product_name: "天地壹号苹果醋铂金版330ml（12+3）",
+        unit_name: null,
+        product_seo_url: "",
+        product_verify_id: 3001,
+        specItem: null,
+        product_inventory_lock: 1002,
+        product_buy_limit: 0,
+        product_weight: 0.0,
+        unit_type_id: 0,
+        product_unit_sp: 0,
+        product_src_id: 165036,
+        product_country: "",
+        productItems: null,
+        product_cubage: "0.00",
+        layout_route_id: 0,
+        product_dist_enable: 0,
+        store_name: "聚万家生鲜超市",
+        unit_id: 0,
+        store_id: 69,
+        shop_weight: 500.0,
+        product_state_id: 1002,
+        tax_class_id: 0,
+        product_shop_card_discount: 1,
+        product_video: "",
+        product_unit_price: 5.0,
+        unit_price: 5.0,
+        spec_ids: "",
+        product_tips: "",
+        product_advice_price: 5.0,
+        product_spec: [],
+        product_assist: "",
+        unit_weight_id: 1,
+        unit_length_id: 1,
+        product_cost_price: 0.0,
+        product_market_price: 5.0,
+        categoryId: null,
+        product_add_time: 1758782031885,
+      },
+    ],
+    shopBaseProductType: {
+      specs: [
+        {
+          spec_id: 1510,
+          spec_name: "苹果醋规格",
+          spec_remark: "",
+          spec_format: "text",
+          spec_order: 50,
+          spec_category_id: 848,
+          spec_buildin: 0,
+          specItems: [],
+          store_id: 69,
+          store_name: null,
+        },
+      ],
+      brands: [
+        {
+          brand_id: 68,
+          brand_name: "其它品牌",
+          brand_name_pinyin: "qi ta pin pai",
+          brand_initial: "q",
+          brand_desc: "其它品牌",
+          category_id: 0,
+          brand_show_type: 1,
+          brand_image: "",
+          brand_recommend: 0,
+          brand_enable: 1,
+          store_id: 69,
+          brand_apply: 1,
+        },
+      ],
+      assists: [],
+    },
+    category: {
+      category_id: 848,
+      category_parent_id: 0,
+      category_name: "苹果醋",
+      category_image:
+        "https://static.gpxscs.cn/media/images/goods_library/20250820/5dd97b994af64e7dad1db0b0f4872d9a.jpg",
+      type_id: 1452,
+      category_virtual_enable: 0,
+      category_show_type: "COLOR",
+      category_commission_rate: 0.0,
+      category_order: 50,
+      category_level: 0,
+      category_is_leaf: 1,
+      category_is_enable: 0,
+      page_id: 0,
+      page_id_pc: 0,
+      data_source: 2,
+      store_id: "69",
+      sub: null,
+      id: null,
+      parent_id: null,
+      name: null,
+      category_icon: "ui-icon-star",
+      category_expanded: true,
+      category_loaded: true,
+      type_name: null,
+      store_name: null,
+    },
+    items: [
+      {
+        item_id: 238819,
+        item_name: "",
+        product_id: 165036,
+        course_category_id: 0,
+        color_id: 0,
+        item_is_default: 1,
+        item_number: "6931780721530",
+        item_barcode: "6931780721530",
+        item_cost_price: 0.0,
+        item_platform_price: 0.0,
+        item_advice_price: 5.0,
+        item_unit_price: 5.0,
+        item_market_price: 5.0,
+        item_unit_points: 0.0,
+        item_unit_sp: 0.0,
+        item_quantity: 500,
+        item_quantity_frozen: 0,
+        item_warn_quantity: 0,
+        item_spec: "[]",
+        spec_item_ids: "",
+        item_enable: 1001,
+        item_is_change: 0,
+        item_weight: 0.0,
+        item_fx_commission: 0.0,
+        item_rebate: 0.0,
+        item_title: "",
+        item_freetime: 0,
+        item_src_id: "238819",
+        category_id: 848,
+        store_id: 69,
+        item_unit_price_1001: 0.0,
+        item_unit_price_1002: 0.0,
+        item_unit_price_1003: 0.0,
+        item_unit_price_1004: 0.0,
+        item_unit_price_1005: 0.0,
+        item_unit_price_1006: 0.0,
+        item_unit_price_1007: 0.0,
+        item_unit_price_1008: 0.0,
+        item_unit_price_1009: 0.0,
+        item_purchase_price: 0.0,
+        item_purchase_rate: 0.0,
+        item_sales_rate: 0.0,
+        version: 0,
+        mergedItemId: null,
+        mergedUnitPrices: null,
+        automatic: null,
+        is_open_automatic: "0",
+      },
+    ],
+    productInfo: {
+      shop_product_detail: {
+        product_id: 165036,
+        product_detail: "",
+        product_param: "",
+        product_service: "",
+        product_meta_title: "",
+        product_meta_description: "",
+        product_meta_keyword: "",
+        product_tags: "",
+      },
+      shop_product_image: [
+        {
+          product_image_id: 167557,
+          product_id: 165036,
+          store_id: 69,
+          color_id: 0,
+          color_name: "",
+          item_image_default:
+            "https://static.gpxscs.cn/media/images/goods_library/20250720/5f9ffeba78b242cb8277ad1ad0773899.jpg",
+          item_image_other:
+            "https://static.gpxscs.cn/media/images/goods_library/20250720/5f9ffeba78b242cb8277ad1ad0773899.jpg",
+          item_image_diy: "",
+          item_video: "",
+          item_image_ext_1: "",
+          item_image_ext_2: "",
+          product_number: "6931780721530",
+          product_name: "天地壹号苹果醋铂金版330ml（12+3）",
+          product_from: "1005",
+        },
+      ],
+      shop_product_assist_index: [],
+      shop_product_info: {
+        product_id: 165036,
+        product_number: "6931780721530",
+        product_barcode: "",
+        product_model: "",
+        product_assist: "",
+        product_spec: "[]",
+        spec_ids: "",
+        product_uniqid: "[]",
+        unit_length_id: 1,
+        unit_weight_id: 1,
+        product_weight: 0.0,
+        product_cubage: "0.00",
+        product_subtract: 1,
+        unit_type_id: 0,
+        tax_class_id: 0,
+        product_buy_limit: 0,
+        product_user_level_discount: 1,
+        product_shop_card_discount: 1,
+      },
+      shop_product_index: {
+        product_id: 165036,
+        product_name: "天地壹号苹果醋铂金版330ml（12+3）",
+        product_name_index: "天地壹号苹果醋铂金版330ml（12+3）",
+        store_id: 69,
+        store_is_open: 1,
+        store_type: 1,
+        store_category_ids: "",
+        category_id: 848,
+        course_category_id: 0,
+        category_ids: "",
+        type_id: 1452,
+        product_quantity: 0,
+        product_warn_quantity: 0,
+        brand_id: 68,
+        product_service_type_ids: "",
+        product_state_id: 1002,
+        product_verify_id: 3001,
+        product_is_invoices: 0,
+        product_is_return: 1,
+        product_is_recommend: 0,
+        product_stock_status: 1,
+        kind_id: 1201,
+        activity_type_ids: "",
+        contract_type_ids: "",
+        product_transport_id: "16",
+        product_assist_data: "",
+        product_add_time: 1758782031885,
+        product_unit_price: 5.0,
+        product_unit_price_max: 0.0,
+        product_unit_points: 0.0,
+        product_unit_sp: 0.0,
+        product_sale_num: 0,
+        product_favorite_num: 0,
+        product_click: 0,
+        product_sale_district_ids: "",
+        product_region_district_ids: "",
+        product_freight: 0.0,
+        product_evaluation_num: 0,
+        product_tags: "",
+        store_is_selfsupport: 1,
+        product_fx_enable: 0,
+        product_dist_enable: 0,
+        product_sale_time: 2077274898815,
+        product_number: "6931780721530",
+        product_order: 50,
+        product_src_id: 165036,
+        market_category_id: "",
+        store_latitude: "23.33033959885149",
+        store_longitude: "110.08898445473912",
+        product_is_video: 0,
+        subsite_id: 0,
+        lecturer_id: 0,
+        card_type_id: 0,
+        voucher_activity_id: "",
+        coupon_type_id: 0,
+        payment_type_id: 0,
+        product_contsign: "",
+        version: 0,
+        is_special: "0",
+      },
+    },
+  },
+};
+
 export default {
   name: "productList",
   components: {
@@ -396,6 +701,7 @@ export default {
       isNoCommodityData: false,
       isNoDownCommodityData: false,
       isRefreshing: false,
+      isLoadingGoodsData: false,
       time: null,
       time2: null,
       showBottomPopup: false,
@@ -433,6 +739,39 @@ export default {
 
   mounted() {},
   methods: {
+    async handleScanCode() {
+      const _this = this;
+      
+      uni.scanCode({
+        success: async function (data) {
+          // console.log("条码类型：" + data.scanType);
+          // console.log("条码内容：" + data.result);
+          try {
+            
+          _this.isLoadingGoodsData = true;
+
+          const res = await GetProductByProductNumber({
+            productNumber: data.result,
+          });
+          
+          _this.isLoadingGoodsData = false;
+
+          if (res?.data != null) {
+            _this.productItem = res?.data?.baseInfo?.[0];
+            _this.showRightPopup = true;
+            _this.isAdd = false;
+          } else {
+            uni.$u.toast("未查询到您的商品");
+          }
+          } catch (error) {
+             _this.isLoadingGoodsData = false;
+          }
+        },
+        fail: function () {
+          uni.$u.toast("扫码失败,请重试");
+        },
+      });
+    },
     pageBack() {
       uni.navigateBack();
     },
@@ -454,6 +793,7 @@ export default {
         this.scrollViewId = `id_0`;
       }
     },
+
     handleNoFocus() {
       e.target.blur(); // 立即失去焦点
       // 或者直接阻止默认行为
@@ -717,6 +1057,10 @@ export default {
       this.showRightPopup = false;
       this.getProductList();
     },
+    goodsEditHandler() {
+      this.showRightPopup = false;
+      this.getProductList();
+    },
     detail(e) {
       uni.navigateTo({
         url: "../productDetail/productDetail",
@@ -770,6 +1114,7 @@ export default {
     },
     handerProductEdit(item) {
       this.productItem = item;
+      console.log(`item`, item);
       this.showRightPopup = true;
       this.isAdd = false;
     },
@@ -1094,10 +1439,16 @@ page {
           border: 1px solid $uni-border-color;
           border-radius: 24rpx;
           overflow: hidden;
+          flex: none;
 
-          .img-box {
+          ::v-deep .img-box {
-            width: 64px;
+            width: 64px !important;
-            height: 64px;
+            height: 64px !important;
+            .u-image,
+            .u-image__image {
+              width: 64px !important;
+              height: 64px !important;
+            }
           }
         }
 

java-mall-app-shop-admin/pages/warehouse/manage/productListSearch.vue

@@ -21,7 +21,7 @@
       <block slot="default">
         <u-search
           class="search"
-          placeholder="搜索你想要的商品"
+           placeholder="请输入商品名称查找"
           :showAction="false"
           v-model="inputSearch"
           @change="handerSearch"

java-mall-app-shop-admin/pages/warehouse/warehouse.vue

@@ -1,8 +1,17 @@
 <template>
   <view class="warehouse-container">
     <status-bar :backgroundColor="'#fff'" v-if="true"></status-bar>
-    <view class="shop-name"><u-icon name="home" size="18"></u-icon>{{ dashboardInfo.store_info.store_name }}</view>
+    <view class="shop-name"
-    <view class="myui_card warehouse-content">
+      ><u-icon name="home" size="18"></u-icon
+      >{{ dashboardInfo.store_info.store_name }}</view
+    >
+    <view class="myui_card
+    
+    
+    
+    
+    
+    warehouse-content">
       <view class="warehouse-list">
         <view class="warehouse-item" @click="skipu('productList')">
           <view class="warehouse-item-img">
@@ -153,7 +162,7 @@ export default {
         .warehouse-item-img {
           margin-bottom: 10rpx;
         }
-        .warehouse-item-name{
+        .warehouse-item-name {
           font-size: 24rpx;
         }
       }

java-mall-app-shop-admin/utils/permission.js

@@ -467,8 +467,8 @@ function premissionCheck(permission) {
           // reject('需要开启相机使用权限');
           let str = unPermission.join(",");
           uni.showModal({
-            title: "温馨提示",
+            title: "权限申请",
-            content: `请注意：该功能需要获取${str}!`,
+            content: `请在设置中开启${str}!`,
             showCancel: true,
             confirmText: "去设置",
             success: function (res) {