Merge branch 'hongqiz合并提交iben1' of http://154.209.4.10:3001/tt0101/zhunong-h5 into hongqiziben1

# Conflicts:
#	src/views/dhjilu.vue

src/api/profile.js

@@ -74,6 +74,8 @@ export const setBankInfo = (data) => {
 export const getLotteryPrize = () => request({ url: "/index/get_lottery_prize", method: "get", loading: true });
 // 兑换奖品
 export const exchangePrize = (data) => request({ url: "/index/exchange_prize", method: "post", data, loading: true });
+// 兑换记录 
+export const getLotteryRecord = () => request({ url: "/index/get_lottery_record", method: "get", loading: true });
 // 设置收货地址 
 export const bindAddress = (data) => request({ url: "/index/bind_address", method: "post", data, loading: true });
 // 获取兑换记录

src/views/China.vue

@@ -75,7 +75,7 @@ export default {
 <style scoped>
 .usremei-container {
   min-height: 100vh;
-  background-image: url('../assets/dabag.png');
+  background:#b43a39;
   background-size: cover;
   background-position: center;
   padding-top: 30px;

src/views/InvitePeople.vue

@@ -80,7 +80,8 @@ export default {
 <style lang="scss" scoped>
 .invite-page {
   min-height: 100%;
-  background: url('~@/assets/dabag.png') no-repeat center center;
+  /* background: url('../assets/dabag.png') no-repeat; */
+  background-color: #b43a39;
   background-size: cover;
   padding: 0px 16px 32px 16px;
   box-sizing: border-box;

src/views/Mall.vue

@@ -174,7 +174,7 @@ export default {
 <style scoped>
 .usremei-container {
   min-height: 100vh;
-  background-image: url('../assets/dabag.png');
+  background: #b43a39;
   background-size: cover;
   background-position: center;
   padding:60px 10px 60px;

src/views/Medical.vue

@@ -75,7 +75,7 @@ export default {
 <style scoped>
 .usremei-container {
   min-height: 100vh;
-  background-image: url('../assets/dabag.png');
+  background:#b43a39;
   background-size: cover;
   background-position: center;
   padding-top: 30px;

src/views/Member.vue

@@ -108,7 +108,8 @@ export default {
 <style scoped>
 .container {
   min-height: 100vh;
-  background: url('../assets/dabag.png') no-repeat;
+  /* background: url('../assets/dabag.png') no-repeat; */
+  background-color: #b43a39;
   background-size: cover;
   background-position: center;
 }

src/views/Mention.vue

@@ -266,7 +266,8 @@ export default {
 <style scoped>
 .vh100 {
   min-height: 100vh;
-  background: url('../assets/dabag.png') no-repeat;
+  /* background: url('../assets/dabag.png') no-repeat; */
+  background-color: #b43a39;
   background-size: cover;
   background-position: center;
 }

src/views/Payment.vue

@@ -144,7 +144,8 @@ export default {
 <style lang="scss" scoped>
 .invite-page {
   min-height: 100vh;
-  background: url('~@/assets/dabag.png') no-repeat center center;
+  /* background: url('../assets/dabag.png') no-repeat; */
+  background-color: #b43a39;
   background-size: cover;
   padding: 70px 16px 32px 16px;
   box-sizing: border-box;

src/views/Profile.vue

@@ -60,7 +60,7 @@
       <div class="asset-card-v4">
         <div class="asset-info-v4">
           <span class="asset-label-v4">我的积分</span>
-          <span class="asset-amount-v4">{{ userInfo.guquan }}</span>
+          <span class="asset-amount-v4">{{ userInfo.jifen }}</span>
         </div>
         <button class="asset-btn-v4 button-click-effect" @click="handleOriginalSharesWithdraw">兑换</button>
       </div>

src/views/RetirementSubsidy.vue

@@ -121,7 +121,7 @@ export default {
 <style scoped>
 .container {
   min-height: 100vh;
-  background-image: url('../assets/dabag.png');
+  background: #b43a39;
   background-size: cover;
   background-position: center;
   padding-bottom: 20px;

src/views/Share.vue

@@ -241,7 +241,8 @@ export default {
 <style scoped>
 .share-container {
   min-height: 100vh;
-  background: url('../assets/dabag.png');
+  /* background: url('../assets/dabag.png') no-repeat; */
+  background-color: #b43a39;
   background-size: 100% 100%;
   background-position: 0 0;
   background-repeat: no-repeat;

src/views/Signin.vue

@@ -215,7 +215,8 @@ export default {
 <style scoped>
 .signin-container {
   min-height: 100vh;
-  background: url('../assets/dabag.png');
+  /* background: url('../assets/dabag.png') no-repeat; */
+  background-color: #b43a39;
   background-size: 100% 100%;
   background-position: 0 0;
   background-repeat: no-repeat;

src/views/TeamDetail.vue

@@ -96,7 +96,8 @@ export default {
 <style scoped>
 .container {
   min-height: 100vh;
-  background: url('../assets/dabag.png') no-repeat;
+  /* background: url('../assets/dabag.png') no-repeat; */
+  background-color: #b43a39;
   background-size: cover;
   background-position: center;
 }