Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

oem/gstj/manifest.json

@@ -131,9 +131,9 @@
                 "frameworks" : [], /*调用Native.js调用原生Objective-c API需要引用的FrameWork，如需调用GameCenter，则添加"GameKit.framework"*/
                 "idfa" : false,
                 "privacyDescription" : {
-                    "NSCameraUsageDescription" : "访问您的摄像头用来拍照上传您的图像！",
-                    "NSPhotoLibraryAddUsageDescription" : "访问您的相册用来保存图像信息！",
-                    "NSPhotoLibraryUsageDescription" : "访问您的相册用来上传您的图像！"
+                    "NSCameraUsageDescription" : "访问您的相册用来上传您的图像用来设置头像！",
+                    "NSPhotoLibraryAddUsageDescription" : "访问您的相册保存图像用来设置头像！",
+                    "NSPhotoLibraryUsageDescription" : "访问您的摄像头用来拍照上传您的图像用来设置头像！"
                 }
             },
             "google" : {

oem/qxst/manifest.json

@@ -131,9 +131,9 @@
                 "frameworks" : [], /*调用Native.js调用原生Objective-c API需要引用的FrameWork，如需调用GameCenter，则添加"GameKit.framework"*/
                 "idfa" : false,
                 "privacyDescription" : {
-                    "NSCameraUsageDescription" : "访问您的摄像头用来拍照上传您的图像！",
-                    "NSPhotoLibraryAddUsageDescription" : "访问您的相册用来保存图像信息！",
-                    "NSPhotoLibraryUsageDescription" : "访问您的相册用来上传您的图像！"
+                    "NSCameraUsageDescription" : "访问您的相册用来上传您的图像用来设置头像！",
+                    "NSPhotoLibraryAddUsageDescription" : "访问您的相册保存图像用来设置头像！",
+                    "NSPhotoLibraryUsageDescription" : "访问您的摄像头用来拍照上传您的图像用来设置头像！"
                 }
             },
             "google" : {

public/manifest.json

@@ -131,9 +131,9 @@
                 "frameworks" : [], /*调用Native.js调用原生Objective-c API需要引用的FrameWork，如需调用GameCenter，则添加"GameKit.framework"*/
                 "idfa" : false,
                 "privacyDescription" : {
-                    "NSCameraUsageDescription" : "访问您的摄像头用来拍照上传您的图像！",
-                    "NSPhotoLibraryAddUsageDescription" : "访问您的相册用来保存图像信息！",
-                    "NSPhotoLibraryUsageDescription" : "访问您的相册用来上传您的图像！"
+                    "NSCameraUsageDescription" : "访问您的相册用来上传您的图像用来设置头像！",
+                    "NSPhotoLibraryAddUsageDescription" : "访问您的相册保存图像用来设置头像！",
+                    "NSPhotoLibraryUsageDescription" : "访问您的摄像头用来拍照上传您的图像用来设置头像！"
                 }
             },
             "google" : {

src/packages/gstj/assets/themes/global/global.css

@@ -0,0 +1,357 @@
+[class*='g-image'] {
+  position: relative;
+  object-fit: cover;
+  overflow: hidden;
+}
+[class*='g-image']:before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: #fff url("../../images/avatar.png") no-repeat center;
+  background-size: cover;
+}
+.g-price-up {
+  color: #ff3333;
+}
+.g-price-normal {
+  color: #333333;
+}
+.g-price-down {
+  color: #0baf1f;
+}
+.g-form__container {
+  display: flex;
+  flex-direction: column;
+  padding-bottom: 0.32rem;
+  /* 父元素的第一个子元素 */
+  /* 相邻兄弟元素 */
+}
+.g-form__container .van-cell-group--inset:first-of-type {
+  margin-top: 0.32rem;
+}
+.g-form__container .van-cell-group--inset + .van-cell-group--inset {
+  margin-top: 0.24rem;
+}
+.g-form__container .van-field .van-stepper {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+.g-form__container .van-field .van-stepper__input {
+  flex: 1;
+}
+.g-form__footer {
+  display: flex;
+  align-items: center;
+}
+.g-form__footer:empty {
+  display: none;
+}
+.g-form__footer.inset {
+  gap: 0.2rem;
+  padding: 0.2rem 0.32rem;
+}
+.g-flex {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.g-flex--row {
+  flex-direction: row;
+}
+.g-flex__body {
+  flex: 1;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+}
+.g-flex__footer {
+  margin-top: auto;
+}
+.g-color--up {
+  color: var(--color-up);
+}
+.g-color--down {
+  color: var(--color-down);
+}
+.g-block--bg {
+  background: #fff url('../../images/block-bg.png') no-repeat center bottom;
+  background-size: 100%;
+}
+/* 导航列表 */
+.g-navmenu .app-iconfont {
+  height: 100%;
+}
+.g-navmenu .app-iconfont__icon {
+  font-size: 0.32rem;
+  margin-right: 0.24rem;
+}
+/* 商品列表 */
+.g-goods-list {
+  padding: 0.2rem;
+}
+.g-goods-list .list {
+  padding: 0.2rem 0.2rem 0 0.2rem;
+}
+.g-goods-list .list-item {
+  display: flex;
+  align-items: center;
+  border-radius: 0.1rem;
+  overflow: hidden;
+  padding: 0.2rem;
+}
+.g-goods-list .list-item:not(:last-child) {
+  margin-bottom: 0.2rem;
+}
+.g-goods-list .list-item .img:first-child {
+  display: flex;
+  align-items: center;
+}
+.g-goods-list .list-item .img:first-child img {
+  width: 1.8rem;
+  height: 1.8rem;
+  object-fit: cover;
+  border-radius: 0.16rem;
+  margin-right: 0.3rem;
+}
+.g-goods-list .list-item .img:last-child .van-button {
+  width: 1.3rem;
+  height: 0.5rem;
+}
+.g-goods-list .list-item .info {
+  flex: 1;
+}
+.g-goods-list .list-item .info .title {
+  color: #333;
+  font-size: 0.3rem;
+}
+.g-goods-list .list-item .info .desc {
+  color: #666;
+  font-size: 0.24rem;
+  padding: 0.1rem 0;
+}
+.g-goods-list .list-item .info .price .buyprice,
+.g-goods-list .list-item .info .price .sellprice {
+  padding-bottom: 0.02rem;
+}
+.g-goods-waterfall {
+  padding: 0.2rem;
+}
+.g-goods-waterfall .goods {
+  background-color: #fff;
+  border-radius: 0.12rem;
+  overflow: hidden;
+}
+.g-goods-waterfall .goods-image {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 2.4rem;
+  font-size: 0;
+}
+.g-goods-waterfall .goods-info {
+  padding: 0.2rem;
+}
+.g-goods-waterfall .goods-info__title {
+  font-size: 0.26rem;
+  margin-bottom: 0.1rem;
+}
+.g-goods-waterfall .goods-info__desc {
+  font-size: 0.24rem;
+  color: #999;
+  margin-bottom: 0.1rem;
+}
+.g-goods-waterfall .goods-info__price {
+  color: #f2270c;
+}
+.g-goods-waterfall .goods-info__price .unit {
+  font-size: 0.24rem;
+}
+.g-goods-waterfall .goods-info__price .integer {
+  font-size: 0.3rem;
+}
+/* 订单列表 */
+.g-order-list {
+  padding: 0.2rem;
+  padding-bottom: 0;
+}
+.g-order-list__box {
+  background-color: #fff;
+  border-radius: 0.16rem;
+  padding: 0.24rem;
+}
+.g-order-list__box:not(:first-child) {
+  margin-top: 0.2rem;
+}
+.g-order-list__titlebar {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 0.2rem;
+}
+.g-order-list__titlebar .left h4 {
+  font-weight: bold;
+}
+.g-order-list__titlebar .left span {
+  font-size: 0.24rem;
+  color: #999;
+}
+.g-order-list__titlebar .right {
+  font-size: 0.24rem;
+  color: #999;
+}
+.g-order-list__content {
+  font-size: 0.24rem;
+}
+.g-order-list__content ul {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.g-order-list__content ul li {
+  display: flex;
+  justify-content: space-between;
+  line-height: 0.4rem;
+  width: calc(50% - .24rem);
+}
+.g-order-list__content ul li span:first-child {
+  color: #999;
+  white-space: nowrap;
+  padding-right: 0.24rem;
+}
+.g-order-list__btnbar {
+  display: flex;
+  justify-content: flex-end;
+  gap: 0.16rem;
+  margin-top: 0.2rem;
+}
+.g-order-list__btnbar .van-button {
+  width: 1.6rem;
+  border-width: 1px;
+}
+.g-detail__buy {
+  background-color: #fff;
+}
+.g-detail__buy .topic {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: #fff;
+  background-image: linear-gradient(to right, #ee0a24, #ff6034);
+  padding: 0.2rem 0.24rem;
+}
+.g-detail__buy .topic-left .price-text {
+  font-size: 0.24rem;
+}
+.g-detail__buy .topic-left .price-integer {
+  font-size: 0.44rem;
+}
+.g-detail__buy .topic-right {
+  display: flex;
+  flex-direction: column;
+  font-size: 0.24rem;
+}
+.g-detail__buy .title {
+  font-size: 0.3rem;
+  font-weight: bold;
+  line-height: 0.48rem;
+  padding: 0.24rem;
+  padding-bottom: 0;
+}
+.g-detail__buy .title .van-tag {
+  font-weight: normal;
+}
+.g-detail__buy .title span {
+  margin-right: 0.1rem;
+}
+.g-detail__buy .desc {
+  padding: 0 0.24rem;
+}
+.g-detail__buy .qty {
+  font-size: 0.24rem;
+  color: #999;
+  padding: 0.1rem 0.24rem 0 0.24rem;
+}
+.g-detail__buy .info {
+  background-color: #fff;
+  padding: 0.2rem;
+}
+.g-detail__buy .info ul {
+  display: flex;
+  flex-wrap: wrap;
+  font-size: 0.26rem;
+}
+.g-detail__buy .info ul li {
+  display: flex;
+  justify-content: space-between;
+  width: 50%;
+  padding: 0.08rem 0.24rem;
+}
+.g-detail__buy .info ul li span:first-child {
+  color: #999;
+}
+.g-detail__desc {
+  background-color: #fff;
+  margin-top: 0.24rem;
+}
+.g-detail__footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 0.88rem;
+  background-color: #fff;
+}
+.g-detail__footer .price {
+  padding-left: 0.32rem;
+}
+.g-detail__footer .price-text,
+.g-detail__footer .price-unit {
+  font-size: 0.24rem;
+}
+.g-detail__footer .price-unit {
+  color: #f2270c;
+}
+.g-detail__footer .price-integer {
+  font-size: 0.32rem;
+  color: #f2270c;
+}
+.g-detail__footer .submit {
+  align-self: stretch;
+  display: flex;
+  margin-left: auto;
+}
+.g-detail__footer .submit-button {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  min-width: 2rem;
+  font-weight: bold;
+  color: #fff;
+  padding: 0 0.48rem;
+}
+.g-detail__footer .submit-button.warning {
+  background-image: linear-gradient(to right, #ffd01e, #ff8917);
+  background-color: #ff8a17;
+}
+.g-detail__footer .submit-button.danger {
+  background-image: linear-gradient(to right, #ff6034, #ee0a24);
+  background-color: #ee270a;
+}
+.van-dialog__message {
+  font-size: 0.28rem;
+  line-height: 0.44rem;
+}
+.van-tabs--list {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.van-tabs--list .van-tabs__content {
+  flex: 1;
+  overflow-y: auto;
+}
+.van-tabs--list .van-tabs__content .van-tab__panel {
+  height: 100%;
+}

src/packages/gstj/assets/themes/global/global.less

@@ -124,6 +124,71 @@
 .g-goods-list {
     padding: .2rem;
 
+    .list {
+        padding: .2rem .2rem 0 .2rem;
+
+        &-item {
+            display: flex;
+            align-items: center;
+            border-radius: .1rem;
+            overflow: hidden;
+            padding: .2rem;
+
+            &:not(:last-child) {
+                margin-bottom: .2rem;
+            }
+
+            .img {
+                &:first-child {
+                    display: flex;
+                    align-items: center;
+
+                    img {
+                        width: 1.8rem;
+                        height: 1.8rem;
+                        object-fit: cover;
+                        border-radius: .16rem;
+                        margin-right: .3rem;
+                    }
+                }
+
+                &:last-child {
+                    .van-button {
+                        width: 1.3rem;
+                        height: .5rem;
+                    }
+                }
+            }
+
+            .info {
+                flex: 1;
+
+                .title {
+                    color: #333;
+                    font-size: .30rem;
+                }
+
+                .desc {
+                    color: #666;
+                    font-size: .24rem;
+                    padding: .1rem 0;
+                }
+
+                .price {
+
+                    .buyprice,
+                    .sellprice {
+                        padding-bottom: .02rem;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.g-goods-waterfall {
+    padding: .2rem;
+
     .goods {
         background-color: #fff;
         border-radius: .12rem;

src/packages/gstj/components/base/waterfall/index.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, watch, nextTick, onActivated } from 'vue'
+import { shallowRef, watch, nextTick, onActivated, onMounted } from 'vue'
 
 const props = defineProps({
     //数据列表
@@ -101,6 +101,10 @@ onActivated(() => {
         render()
     }
 })
+
+onMounted(() => {
+    render()
+})
 </script>
 
 <style lang="less">

src/packages/gstj/views/home/Index.vue

@@ -139,7 +139,7 @@ onMounted(() => {
 
   if (os === 'iOS') {
     plus.httpRequest({
-      url: 'https://itunes.apple.com/lookup?id=1661067556'
+      url: 'https://itunes.apple.com/lookup?id=6459789608'
     }).then((res) => {
       const results = res.data.results
       if (results?.length) {

src/packages/gstj/views/spot/list/Index.vue

@@ -4,12 +4,13 @@
             <app-navbar title="现货挂牌">
                 <template #right>
                     <Icon name="add" size=".4rem" @click="$router.push({ name: 'spot-add' })" />
+                    <Icon name="bars" size=".4rem" @click="isWaterfall = !isWaterfall" />
                 </template>
             </app-navbar>
         </template>
         <app-pull-refresh ref="pullRefreshRef" class="purchase__container" v-model:loading="loading" v-model:error="error"
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <Waterfall class="g-goods-waterfall" :data-list="dataList">
+            <Waterfall class="g-goods-waterfall" :data-list="dataList" v-if="isWaterfall">
                 <template #default="{ item }">
                     <div class="goods"
                         @click="$router.push({ name: 'spot-detail', query: { wrfactortypeid: item.wrfactortypeid } })">
@@ -33,6 +34,29 @@
                     </div>
                 </template>
             </Waterfall>
+            <ul class="g-goods-list" v-else>
+                <li class="list-item g-block--bg" v-for="(item, index) in dataList" :key="index"
+                    @click="$router.push({ name: 'spot-detail', query: { wrfactortypeid: item.wrfactortypeid } })">
+                    <div class="img"><img :src="getFirstImage(item.thumurls)" /></div>
+                    <div class="info">
+                        <div class="title"><span>{{ item.wrstandardcode }} / {{ item.wrstandardname }}</span></div>
+                        <div class="desc">{{ item.warehousename }}</div>
+                        <div class="price">
+                            <div class="sellprice" v-if="item.sellprice">
+                                <Tag type="danger" plain>卖价</Tag>
+                                <span class="unit">￥</span>
+                                <span class="integer">{{ item.sellprice }}</span>
+                            </div>
+                            <div class="buyprice" v-if="item.buyprice">
+                                <Tag type="warning" plain>买价</Tag>
+                                <span class="unit">￥</span>
+                                <span class="integer">{{ item.buyprice }}</span>
+                            </div>
+                        </div>
+                    </div>
+
+                </li>
+            </ul>
         </app-pull-refresh>
     </app-view>
 </template>
@@ -46,6 +70,7 @@ import { queryOrderQuote } from '@/services/api/goods'
 import AppPullRefresh from '../../../components/base/pull-refresh/index.vue'
 import Waterfall from '../../../components/base/waterfall/index.vue'
 
+const isWaterfall = shallowRef(false)
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const dataList = shallowRef<Model.OrderQuoteRsp[]>([])

src/packages/pc/views/market/trade/presell/transfer/index.vue

@@ -122,7 +122,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 
 const onRowClick = (row: Model.OrderQuoteRsp) => {
     goodsId.value = row.goodsid
-    // openComponent('detail')
+    openComponent('detail')
 }
 
 onMounted(() => {