fix: 系统名称修改、商品详情回显修复，logo，环境修改

mall4uni/.env.development

@@ -10,7 +10,7 @@ VITE_APP_ENV = 'development'
 VITE_APP_MP_APPID = 'wx42bbe857570c5b40'
 
 # 统一接口域名
-VITE_APP_BASE_API = 'http://127.0.0.1:8086'
+VITE_APP_BASE_API = 'https://wy6.test.jiutianda.cn'
 
 # 图片域名
 VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/'

mall4uni/src/manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "",
-    "appid" : "__UNI__2CF44C6",
+  "name": "甄味馆",
+  "appid": "__UNI__6140E53",
   "description": "",
   "versionName": "1.0.0",
   "versionCode": "100",
@@ -65,7 +65,7 @@
     "requiredPrivateInfos": ["getLocation", "chooseLocation"]
   },
   "h5": {
-        "title" : "",
+    "title": "甄味馆",
     "domain": "https://mini-h5.mall4j.com",
     "router": {
       "mode": "history"

mall4uni/src/pages.json

@@ -1,13 +1,12 @@
 {
-  "pages": [
-    {
+  "pages": [{
       "path": "pages/index/index",
       "style": {
         "backgroundTextStyle": "dark",
         "navigationBarBackgroundColor": "#fff",
         "navigationBarTextStyle": "black",
         "enablePullDownRefresh": true,
-        "navigationBarTitleText": "mall4j"
+        "navigationBarTitleText": "甄味馆"
       }
     },
     {
@@ -158,8 +157,7 @@
   "tabBar": {
     "selectedColor": "#3a86b9",
     "color": "#b8b8b8",
-    "list": [
-      {
+    "list": [{
         "pagePath": "pages/index/index",
         "text": "首页",
         "iconPath": "/static/images/tabbar/homepage.png",

mall4uni/src/pages/accountLogin/accountLogin.scss

@@ -5,12 +5,10 @@
 }
 image {
   display: block;
-  width: 150rpx;
+  width: 180rpx;
   height: 150rpx;
   margin: auto;
-  border-radius: 50%;
-  width: 150rpx;
-  height: 150rpx;
+  // border-radius: 50%;
   margin-bottom: 8%;
 }
 .login-form {

mall4uni/src/pages/index/index.vue

@@ -2,14 +2,8 @@
   <view class="container">
     <view class="bg-sear">
       <view class="scrolltop">
-        <view
-          class="section"
-          @tap="toSearchPage"
-        >
-          <image
-            src="@/static/images/icon/search.png"
-            class="search-img"
-          />
+        <view class="section" @tap="toSearchPage">
+          <image src="@/static/images/icon/search.png" class="search-img" />
           <text class="placeholder">
             搜索
           </text>
@@ -19,30 +13,13 @@
 
     <view class="content">
       <!-- swiper -->
-      <swiper
-        :autoplay="autoplay"
-        :indicator-color="indicatorColor"
-        :interval="interval"
-        :duration="duration"
-        :indicator-active-color="indicatorActiveColor + ' '"
-        :circular="true"
-        class="pic-swiper"
-        indicator-dots
-        previous-margin="20rpx"
-        next-margin="20rpx"
-      >
-        <block
-          v-for="(item, index) in indexImgs"
-          :key="index"
-        >
+      <swiper :autoplay="autoplay" :indicator-color="indicatorColor" :interval="interval" :duration="duration"
+        :indicator-active-color="indicatorActiveColor + ' '" :circular="true" class="pic-swiper" indicator-dots
+        previous-margin="20rpx" next-margin="20rpx">
+        <block v-for="(item, index) in indexImgs" :key="index">
           <swiper-item class="banner-item">
             <view class="img-box">
-              <image
-                :src="item.imgUrl"
-                :data-prodid="item.relation"
-                class="banner"
-                @tap="toProdPage"
-              />
+              <image :src="item.imgUrl" :data-prodid="item.relation" class="banner" @tap="toProdPage" />
             </view>
           </swiper-item>
         </block>
@@ -50,60 +27,29 @@
       <!-- end swiper -->
 
       <view class="cat-item">
-        <view
-          class="item"
-          data-sts="1"
-          @tap="toClassifyPage"
-        >
+        <view class="item" data-sts="1" @tap="toClassifyPage">
           <image src="@/static/images/icon/newProd.png" />
           <text>新品推荐</text>
         </view>
-        <view
-          class="item"
-          data-sts="1"
-          @tap="toClassifyPage"
-        >
+        <view class="item" data-sts="1" @tap="toClassifyPage">
           <image src="@/static/images/icon/timePrice.png" />
           <text>限时特惠</text>
         </view>
-        <view
-          class="item"
-          data-sts="3"
-          @tap="toClassifyPage"
-        >
+        <view class="item" data-sts="3" @tap="toClassifyPage">
           <image src="@/static/images/icon/neweveryday.png" />
           <text>每日疯抢</text>
         </view>
-        <view
-          class="item"
-          @tap="toCouponCenter"
-        >
+        <view class="item" @tap="toCouponCenter">
           <image src="@/static/images/icon/newprods.png" />
           <text>领优惠券</text>
         </view>
       </view>
 
       <!-- 消息播放 -->
-      <view
-        v-if="news && news.length"
-        class="message-play"
-        @tap="onNewsPage"
-      >
-        <image
-          src="@/static/images/icon/horn.png"
-          class="hornpng"
-        />
-        <swiper
-          :vertical="true"
-          :autoplay="true"
-          :circular="true"
-          duration="1000"
-          class="swiper-cont"
-        >
-          <block
-            v-for="(item, index) in news"
-            :key="index"
-          >
+      <view v-if="news && news.length" class="message-play" @tap="onNewsPage">
+        <image src="@/static/images/icon/horn.png" class="hornpng" />
+        <swiper :vertical="true" :autoplay="true" :circular="true" duration="1000" class="swiper-cont">
+          <block v-for="(item, index) in news" :key="index">
             <swiper-item class="items">
               {{ item.title }}
             </swiper-item>
@@ -113,49 +59,24 @@
       </view>
     </view>
 
-    <view
-      v-if="updata"
-      class="updata"
-    >
-      <block
-        v-for="(item, index) in taglist"
-        :key="index"
-      >
+    <view v-if="updata" class="updata">
+      <block v-for="(item, index) in taglist" :key="index">
         <!-- 每日上新 -->
-        <view
-          v-if="item.style==='2' && item.prods && item.prods.length"
-          class="up-to-date"
-        >
+        <view v-if="item.style==='2' && item.prods && item.prods.length" class="up-to-date">
           <view class="title">
             <text>{{ item.title }}</text>
-            <view
-              class="more-prod-cont"
-              data-sts="0"
-              :data-id="item.id"
-              :data-title="item.title"
-              @tap="toClassifyPage"
-            >
+            <view class="more-prod-cont" data-sts="0" :data-id="item.id" :data-title="item.title" @tap="toClassifyPage">
               <text class="more">
                 查看更多
               </text>
             </view>
           </view>
           <view class="item-cont">
-            <block
-              v-for="(prod, index2) in item.prods"
-              :key="index2"
-            >
-              <view
-                class="prod-item"
-                :data-prodid="prod.prodId"
-                @tap="toProdPage"
-              >
+            <block v-for="(prod, index2) in item.prods" :key="index2">
+              <view class="prod-item" :data-prodid="prod.prodId" @tap="toProdPage">
                 <view>
                   <view class="imagecont">
-                    <img-show
-                      :src="prod.pic"
-                      :class-list="['prodimg']"
-                    />
+                    <img-show :src="prod.pic" :class-list="['prodimg']" />
                   </view>
                   <view class="prod-text">
                     {{ prod.prodName }}
@@ -178,19 +99,10 @@
         </view>
 
         <!-- 商城热卖 -->
-        <view
-          v-if="item.style==='1' && item.prods && item.prods.length"
-          class="hot-sale"
-        >
+        <view v-if="item.style==='1' && item.prods && item.prods.length" class="hot-sale">
           <view class="title">
             <text>{{ item.title }}</text>
-            <view
-              class="more-prod-cont"
-              data-sts="0"
-              :data-id="item.id"
-              :data-title="item.title"
-              @tap="toClassifyPage"
-            >
+            <view class="more-prod-cont" data-sts="0" :data-id="item.id" :data-title="item.title" @tap="toClassifyPage">
               <text class="more">
                 更多
               </text>
@@ -198,20 +110,10 @@
             </view>
           </view>
           <view class="hotsale-item-cont">
-            <block
-              v-for="(prod, index2) in item.prods"
-              :key="index2"
-            >
-              <view
-                class="prod-items"
-                :data-prodid="prod.prodId"
-                @tap="toProdPage"
-              >
+            <block v-for="(prod, index2) in item.prods" :key="index2">
+              <view class="prod-items" :data-prodid="prod.prodId" @tap="toProdPage">
                 <view class="hot-imagecont">
-                  <img-show
-                    :src="prod.pic"
-                    :class-list="['hotsaleimg']"
-                  />
+                  <img-show :src="prod.pic" :class-list="['hotsaleimg']" />
                 </view>
                 <view class="hot-text">
                   <view class="hotprod-text">
@@ -232,10 +134,7 @@
                         .{{ wxs.parsePrice(prod.price)[1] }}
                       </text>
                     </view>
-                    <image
-                      src="@/static/images/tabbar/basket-sel.png"
-                      class="basket-img"
-                    />
+                    <image src="@/static/images/tabbar/basket-sel.png" class="basket-img" />
                   </view>
                 </view>
               </view>
@@ -244,28 +143,15 @@
         </view>
 
         <!-- 更多宝贝 -->
-        <view
-          v-if="item.style==='0' && item.prods && item.prods.length"
-          class="more-prod"
-        >
+        <view v-if="item.style==='0' && item.prods && item.prods.length" class="more-prod">
           <view class="title">
             {{ item.title }}
           </view>
           <view class="prod-show">
-            <block
-              v-for="(prod, index2) in item.prods"
-              :key="index2"
-            >
-              <view
-                class="show-item"
-                :data-prodid="prod.prodId"
-                @tap="toProdPage"
-              >
+            <block v-for="(prod, index2) in item.prods" :key="index2">
+              <view class="show-item" :data-prodid="prod.prodId" @tap="toProdPage">
                 <view class="more-prod-pic">
-                  <img-show
-                    :src="prod.pic"
-                    :class-list="['more-pic']"
-                  />
+                  <img-show :src="prod.pic" :class-list="['more-pic']" />
                 </view>
                 <view class="prod-text-right">
                   <view class="prod-text more">
@@ -286,11 +172,7 @@
                         .{{ wxs.parsePrice(prod.price)[1] }}
                       </text>
                     </view>
-                    <image
-                      src="@/static/images/tabbar/basket-sel.png"
-                      class="basket-img"
-                      @tap.stop="addToCart(prod)"
-                    />
+                    <image src="@/static/images/tabbar/basket-sel.png" class="basket-img" @tap.stop="addToCart(prod)" />
                   </view>
                 </view>
               </view>
@@ -372,7 +254,9 @@ const addToCart = (item) => {
           prodId: item.prodId
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         http.request({
             url: '/p/shopCart/changeItem',
             method: 'POST',
@@ -398,7 +282,7 @@ const addToCart = (item) => {
   const toCouponCenter = () => {
     uni.showToast({
       icon: 'none',
-    title: '该功能未开源'
+      title: '功能开发中'
     })
   }
 
@@ -446,7 +330,9 @@ const getIndexImgs = () => {
         method: 'GET',
         data: {}
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         indexImgs.value = data
         seq.value = data
       })
@@ -459,7 +345,9 @@ const getNoticeList = () => {
         method: 'GET',
         data: {}
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         news.value = data
       })
   }
@@ -473,7 +361,9 @@ const getTag = () => {
         method: 'GET',
         data: {}
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         taglist.value = data
         for (let i = 0; i < data.length; i++) {
           updata.value = false
@@ -492,7 +382,9 @@ const getTagProd = (id, index) => {
           size: 6
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         updata.value = false
         updata.value = true
         const taglistParam = taglist.value

mall4uni/src/pages/register/register.scss

@@ -5,12 +5,10 @@
 }
 image {
   display: block;
-  width: 150rpx;
+  width: 180rpx;
   height: 150rpx;
   margin: auto;
-  border-radius: 50%;
-  width: 150rpx;
-  height: 150rpx;
+  // border-radius: 50%;
   margin-bottom: 8%;
 }
 .login-form {

mall4uni/src/pages/user/user.vue

@@ -1,21 +1,16 @@
 <template>
   <view class="container">
     <!-- 用户信息 -->
-    <view
-      v-if="isAuthInfo"
-      class="userinfo"
-    >
+    <view v-if="isAuthInfo" class="userinfo">
       <view class="userinfo-con">
         <view class="userinfo-avatar">
-          <image
-            :src="
+          <image :src="
               loginResult.pic
                 ?
                   (loginResult.pic.indexOf('http') === -1 ? picDomain + loginResult.pic : loginResult.pic)
                 :
                   '/static/images/icon/head04.png'
-            "
-          />
+            " />
         </view>
         <view class="userinfo-name">
           <view>{{ loginResult.nickName ? loginResult.nickName : "用户昵称" }}</view>
@@ -23,20 +18,11 @@
       </view>
     </view>
 
-    <view
-      v-if="!isAuthInfo"
-      class="userinfo-none"
-    >
-      <view
-        class="default-pic"
-        @tap="toLogin"
-      >
+    <view v-if="!isAuthInfo" class="userinfo-none">
+      <view class="default-pic" @tap="toLogin">
         <image src="@/static/images/icon/head04.png" />
       </view>
-      <view
-        class="none-login"
-        @tap="toLogin"
-      >
+      <view class="none-login" @tap="toLogin">
         <button class="unlogin">
           未登录
         </button>
@@ -54,63 +40,34 @@
           <text style="font-weight:bold">
             我的订单
           </text>
-          <view
-            class="checkmore"
-            data-sts="0"
-            @tap="toOrderListPage"
-          >
+          <view class="checkmore" data-sts="0" @tap="toOrderListPage">
             <text>查看全部</text>
             <text class="arrowhead" />
           </view>
         </view>
         <view class="procedure">
-          <view
-            class="items"
-            data-sts="1"
-            @tap="toOrderListPage"
-          >
+          <view class="items" data-sts="1" @tap="toOrderListPage">
             <image src="@/static/images/icon/toPay.png" />
             <text>待支付</text>
-            <text
-              v-if="orderAmount.unPay>0"
-              class="num-badge"
-            >
+            <text v-if="orderAmount.unPay>0" class="num-badge">
               {{ orderAmount.unPay }}
             </text>
           </view>
-          <view
-            class="items"
-            data-sts="2"
-            @tap="toOrderListPage"
-          >
+          <view class="items" data-sts="2" @tap="toOrderListPage">
             <image src="@/static/images/icon/toDelivery.png" />
             <text>待发货</text>
-            <text
-              v-if="orderAmount.payed>0"
-              class="num-badge"
-            >
+            <text v-if="orderAmount.payed>0" class="num-badge">
               {{ orderAmount.payed }}
             </text>
           </view>
-          <view
-            class="items"
-            data-sts="3"
-            @tap="toOrderListPage"
-          >
+          <view class="items" data-sts="3" @tap="toOrderListPage">
             <image src="@/static/images/icon/toTake.png" />
             <text>待收货</text>
-            <text
-              v-if="orderAmount.consignment>0"
-              class="num-badge"
-            >
+            <text v-if="orderAmount.consignment>0" class="num-badge">
               {{ orderAmount.consignment }}
             </text>
           </view>
-          <view
-            class="items"
-            data-sts="5"
-            @tap="toOrderListPage"
-          >
+          <view class="items" data-sts="5" @tap="toOrderListPage">
             <image src="@/static/images/icon/toComment.png" />
             <text>已完成</text>
           </view>
@@ -119,60 +76,33 @@
       <!--end 订单状态 -->
 
       <view class="prod-col">
-        <view
-          class="col-item"
-          @tap="myCollectionHandle"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
+        <view class="col-item" @tap="myCollectionHandle">
+          <view v-if="loginResult" class="num">
             {{ collectionCount }}
           </view>
-          <view
-            v-else
-            class="num"
-          >
+          <view v-else class="num">
             --
           </view>
           <view class="tit">
             我的收藏
           </view>
         </view>
-        <view
-          class="col-item"
-          @tap="handleTips"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
+        <view class="col-item" @tap="handleTips">
+          <view v-if="loginResult" class="num">
             5
           </view>
-          <view
-            v-else
-            class="num"
-          >
+          <view v-else class="num">
             --
           </view>
           <view class="tit">
             我的消息
           </view>
         </view>
-        <view
-          class="col-item"
-          @tap="handleTips"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
+        <view class="col-item" @tap="handleTips">
+          <view v-if="loginResult" class="num">
             3
           </view>
-          <view
-            v-else
-            class="num"
-          >
+          <view v-else class="num">
             --
           </view>
           <view class="tit">
@@ -182,40 +112,28 @@
       </view>
 
       <view class="my-menu">
-        <view
-          class="memu-item"
-          @tap="toDistCenter"
-        >
+        <view class="memu-item" @tap="toDistCenter">
           <view class="i-name">
             <image src="@/static/images/icon/promotion.png" />
             <text>分销中心</text>
           </view>
           <view class="arrowhead" />
         </view>
-        <view
-          class="memu-item"
-          @tap="toCouponCenter"
-        >
+        <view class="memu-item" @tap="toCouponCenter">
           <view class="i-name">
             <image src="@/static/images/icon/getCoupon.png" />
             <text>领券中心</text>
           </view>
           <view class="arrowhead" />
         </view>
-        <view
-          class="memu-item"
-          @tap="toMyCouponPage"
-        >
+        <view class="memu-item" @tap="toMyCouponPage">
           <view class="i-name">
             <image src="@/static/images/icon/myCoupon.png" />
             <text>我的优惠券</text>
           </view>
           <view class="arrowhead" />
         </view>
-        <view
-          class="memu-item"
-          @tap="toAddressList"
-        >
+        <view class="memu-item" @tap="toAddressList">
           <view class="i-name">
             <image src="@/static/images/icon/myAddr.png" />
             <text>收货地址</text>
@@ -225,11 +143,7 @@
       </view>
       <!--end 列表项 -->
 
-      <view
-        v-if="isAuthInfo"
-        class="log-out"
-        @tap="logout"
-      >
+      <view v-if="isAuthInfo" class="log-out" @tap="logout">
         <view class="log-out-n">
           <text>退出登录</text>
         </view>
@@ -258,7 +172,9 @@ onShow(() => {
           method: 'GET',
           data: {}
         })
-      .then(({ data }) => {
+        .then(({
+          data
+        }) => {
           uni.hideLoading()
           orderAmount.value = data
         })
@@ -269,25 +185,25 @@ onShow(() => {
   const toDistCenter = () => {
     uni.showToast({
       icon: 'none',
-    title: '该功能未开源'
+      title: '功能开发中'
     })
   }
   const toCouponCenter = () => {
     uni.showToast({
       icon: 'none',
-    title: '该功能未开源'
+      title: '功能开发中'
     })
   }
   const toMyCouponPage = () => {
     uni.showToast({
       icon: 'none',
-    title: '该功能未开源'
+      title: '功能开发中'
     })
   }
   const handleTips = () => {
     uni.showToast({
       icon: 'none',
-    title: '该功能未开源'
+      title: '功能开发中'
     })
   }
   const toAddressList = () => {
@@ -314,7 +230,9 @@ const showCollectionCount = () => {
         method: 'GET',
         data: {}
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         uni.hideLoading()
         collectionCount.value = data
       })

mall4v/src/components/tiny-mce/index.vue

@@ -78,9 +78,9 @@ const props = defineProps({
 
 const toxFullscreen = ref(false)
 let hasInit = false
-let hasChange = false
+let hasChange = -1
 watch(() => props.modelValue, (val) => {
-  if (!hasChange && hasInit) {
+  if (hasChange < 1 && hasInit) {
     setContent(val)
   }
 })
@@ -151,7 +151,7 @@ const initTinymce = () => {
       }
       hasInit = true
       editor.on('NodeChange Change KeyUp SetContent', () => {
-        hasChange = true
+        hasChange += 1
         emit('update:modelValue', editor.getContent())
       })
     },

mall4v/src/layout/main-navbar.vue

@@ -15,14 +15,14 @@
           v-if="!sidebarFold"
           class="site-navbar-lg"
         >
-          mall4j建站后台
+        甄味馆后台
         </span>
         <span
           v-else
           class="site-navbar-mini"
           :style="fontCloseSize"
         >
-          mall4j
+        甄味馆
         </span>
       </div>
       <!--右侧数据-->

mall4v/src/views/common/home/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-home">
-    <p>一个基于spring boot、spring oauth2.0、mybatis、redis的轻量级、前后端分离、拥有完整sku和下单流程的完全开源商城</p>
+    <!-- <p>一个基于spring boot、spring oauth2.0、mybatis、redis的轻量级、前后端分离、拥有完整sku和下单流程的完全开源商城</p>
     <p>&nbsp;</p>
     <p>该项目仅供学习参考、可供个人学习使用、如需商用联系作者进行授权，否则必将追究法律责任</p>
     <p>&nbsp;</p>
@@ -123,7 +123,7 @@
         <code>ApiApplication</code> 启动项目前端接口
       </li>
     </ul>
-    <p>&nbsp;</p>
+    <p>&nbsp;</p> -->
   </div>
 </template>
 

mall4v/src/views/modules/shop/transport/add-or-update.vue

@@ -432,7 +432,7 @@ const addOrUpdateRef = ref(null)
  */
 const onAddOrUpdate = () => {
   ElMessage({
-    message: '该功能未开源',
+    message: '功能开发中',
     type: 'warning',
     duration: 1500
   })