Merge refs/remotes/origin/lqs into refs/heads/master

pages/cp-zlg/created/cangpin/xiangqing/xiangqing.wxml

@@ -1,6 +1,23 @@
-  <view class="body">
-    <image src="/imgs/邮票.png"></image>
-      <view>叶星生人民大会堂西藏厅壁画</view>
+<view class="body">
+  <image class="img1" src="/imgs/邮票.png"></image>
+  <view class="text">
+    <view class="text1">
+      <text>
+        叶星生人民大会堂西藏厅壁画
+      </text>
+    </view>
+    <view class="text2">
       <image class="pad-img" src="/imgs/pad.png"></image>
-      <view style="font-size: 26rpx; float: left;">C1109#0092/10000</view>
-  </view>
+      <text style="float: left;">C1109#0092/10000</text>
+    </view>
+  </view>
+  <view class="body2">
+    <view class="title">
+      <text class="title-text">作品故事</text>
+    </view>
+    <view class="block-1"></view>
+    <view class="img2">
+    <image class="img2-img" src="/imgs/邮票详情.png"></image>
+    </view>
+  </view>
+</view>

pages/cp-zlg/created/cangpin/xiangqing/xiangqing.wxss

@@ -1,6 +1,52 @@
+.img1{
+  width: 100%;
+  height: 750rpx;
+}
 .pad-img{
   width: 26rpx;
   height: 32rpx;
   float: left;
   margin-right: 10rpx;
+}
+.text{
+  padding: 0rpx 58rpx 28rpx 30rpx;
+  overflow: hidden;
+}
+.text1{
+  font-size: 30rpx;
+  font-weight: normal;
+  line-height: 42rpx;
+}
+.text2{
+  margin-top: 12rpx;
+  font-size: 26rpx;
+}
+.body2{
+  background-color: #fafafa;
+}
+.title{
+  margin-left: 62rpx;
+}
+.title-text{
+  color: rgba(12,110,77,1);
+  font-size: 30rpx;
+  font-weight: 500;
+  line-height: 42rpx;
+}
+.block-1{
+    background-color: rgba(37,173,104,1.000000);
+    width: 152rpx;
+    height: 6rpx;
+    margin: 6rpx 568rpx 0 30rpx;
+}
+.img2-img{
+  width: 100%;
+  height: 983.92pt;
+}
+.img2{
+  margin-top: 20rpx;
+  width: 90%;
+  margin-left: 30rpx;
+  border-radius: 8rpx;
+  border: 0.5px solid rgba(238,238,238,1);
 }

pages/shiming/shiming.wxss

@@ -57,7 +57,7 @@
   overflow: hidden;
   pointer-events: none;
   animation: myfirst 0.5s;
-  z-index: 2000;
+  z-index: 1000;
 }
 @keyframes myfirst {
   from {